[simspark-svn] SF.net SVN: simspark:[404] trunk

[<he...@us...>]

Revision: 404
          http://sourceforge.net/p/simspark/svn/404
Author:   hedayat
Date:     2015-09-12 01:48:59 +0000 (Sat, 12 Sep 2015)
Log Message:
-----------
Undo some weird changes in GUI branch

Modified Paths:
--------------
    trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h
    trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
    trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp

Modified: trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h	2015-09-12 01:48:50 UTC (rev 403)
+++ trunk/rcssserver3d/plugin/soccer/rcs3dmonitor/rcs3dmonitor.h	2015-09-12 01:48:59 UTC (rev 404)
@@ -144,7 +144,7 @@
     TNodeCacheMap mNodeCache;
 };
 
-DECLARE_ABSTRACTCLASS(RCS3DMonitor);
+DECLARE_CLASS(RCS3DMonitor);
 
 #endif // RCS3DMONITOR_H__
 

Modified: trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h
===================================================================
--- trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h	2015-09-12 01:48:50 UTC (rev 403)
+++ trunk/rcssserver3d/plugin/soccer/sexpmonitor/sexpmonitor.h	2015-09-12 01:48:59 UTC (rev 404)
@@ -124,6 +124,6 @@
     bool mSentFlags;
 };
 
-DECLARE_ABSTRACTCLASS(SexpMonitor);
+DECLARE_CLASS(SexpMonitor);
 
 #endif // SEXPMONITOR_H__

Modified: trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp
===================================================================
--- trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp	2015-09-12 01:48:50 UTC (rev 403)
+++ trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp	2015-09-12 01:48:59 UTC (rev 404)
@@ -614,6 +614,25 @@
 
     ERunScriptErrorType result = eNotFound;
 
+    // Trying directory given in mRelPathPrefix
+    if (!mRelPathPrefix.empty())
+    {
+        result = RunInitScriptInternal(mRelPathPrefix, fileName, validDotDir, dotDir);
+        if (result == eOK)
+        {
+            GetLog()->Debug() << "(ScriptServer) : Ran init script '"
+                              << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+            return true;
+        }
+        else if (result == eError)
+        {
+            GetLog()->Error() << "(ScriptServer) ERROR: Found error in init script '"
+                              << mRelPathPrefix << salt::RFile::Sep() << fileName << "'\n";
+            return false;
+        }
+    }
+
+
     if (validDotDir)
     {
         // Trying dot-dir in home directory

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.