Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

8 files changed, 66 insertions, 23 deletions

diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index e3ad52a..d63ac2e 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Grid.GridServer
         protected GridConfig m_config;
         public string m_consoleType = "local";
         public IConfigSource m_configSource = null;
+        public string m_configFile = "GridServer_Config.xml";
 
         public GridConfig Config
         {
@@ -91,7 +92,7 @@ namespace OpenSim.Grid.GridServer
                 break;
             }
             MainConsole.Instance = m_console;
-            m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), "GridServer_Config.xml")));
+            m_config = new GridConfig("GRID SERVER", (Path.Combine(Util.configDir(), m_configFile)));
 
             m_log.Info("[GRID]: Starting HTTP process");
             m_httpServer = new BaseHttpServer(m_config.HttpPort);
diff --git a/OpenSim/Grid/GridServer/Program.cs b/OpenSim/Grid/GridServer/Program.cs
index c7ba897..741a01b 100644
--- a/OpenSim/Grid/GridServer/Program.cs
+++ b/OpenSim/Grid/GridServer/Program.cs
@@ -36,6 +36,7 @@ namespace OpenSim.Grid.GridServer
         {
             ArgvConfigSource argvSource = new ArgvConfigSource(args);
             argvSource.AddSwitch("Startup", "console", "c");
+            argvSource.AddSwitch("Startup", "xmlfile", "x");
 
             XmlConfigurator.Configure();
 
@@ -45,6 +46,7 @@ namespace OpenSim.Grid.GridServer
             if (startupConfig != null)
             {
                 app.m_consoleType = startupConfig.GetString("console", "local");
+                app.m_configFile = startupConfig.GetString("xmlfile", "GridServer_Config.xml");
             }
 
             app.m_configSource = argvSource;
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs
index 654e770..f2631a7 100644
--- a/OpenSim/Grid/MessagingServer/Main.cs
+++ b/OpenSim/Grid/MessagingServer/Main.cs
@@ -59,16 +59,19 @@ namespace OpenSim.Grid.MessagingServer
 
         protected static string m_consoleType = "local";
         protected static IConfigSource m_config = null;
+        protected static string m_configFile = "MessagingServer_Config.xml";
 
         public static void Main(string[] args)
         {
             ArgvConfigSource argvSource = new ArgvConfigSource(args);
             argvSource.AddSwitch("Startup", "console", "c");
+            argvSource.AddSwitch("Startup", "xmlfile", "x");
 
             IConfig startupConfig = argvSource.Configs["Startup"];
             if (startupConfig != null)
             {
                 m_consoleType = startupConfig.GetString("console", "local");
+                m_configFile = startupConfig.GetString("xmlfile", "MessagingServer_Config.xml");
             }
 
             m_config = argvSource;
@@ -164,7 +167,7 @@ namespace OpenSim.Grid.MessagingServer
 
         protected override void StartupSpecific()
         {
-            Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
+            Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), m_configFile)));
 
             m_userDataBaseService = new UserDataBaseService();
             m_userDataBaseService.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 1ee53ef..baf0fd3 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -76,16 +76,19 @@ namespace OpenSim.Grid.UserServer
 
         protected static string m_consoleType = "local";
         protected static IConfigSource m_config = null;
+        protected static string m_configFile = "UserServer_Config.xml";
 
         public static void Main(string[] args)
         {
             ArgvConfigSource argvSource = new ArgvConfigSource(args);
             argvSource.AddSwitch("Startup", "console", "c");
+            argvSource.AddSwitch("Startup", "xmlfile", "x");
 
             IConfig startupConfig = argvSource.Configs["Startup"];
             if (startupConfig != null)
             {
                 m_consoleType = startupConfig.GetString("console", "local");
+                m_configFile = startupConfig.GetString("xmlfile", "UserServer_Config.xml");
             }
 
             m_config = argvSource;
@@ -151,7 +154,7 @@ namespace OpenSim.Grid.UserServer
 
         protected virtual IInterServiceInventoryServices StartupCoreComponents()
         {
-            Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
+            Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), m_configFile)));
 
             m_httpServer = new BaseHttpServer(Cfg.HttpPort);
 
diff --git a/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs b/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs
index 7d5c310..cd2fe4f 100644
--- a/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/NPC/INPCModule.cs
@@ -1,4 +1,31 @@
-using OpenMetaverse;
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using OpenMetaverse;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Avatar.NPC
diff --git a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
index b61959f..3c5e8c9 100644
--- a/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/Chat/ChannelState.cs
@@ -213,7 +213,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Chat
             m_log.DebugFormat("[IRC-Channel-{0}] AccessPassword : <{1}>", cs.idn, cs.AccessPassword);
             string[] excludes = config.GetString("exclude_list", "").Trim().Split(new Char[] { ',' });
             cs.ExcludeList = new List<string>(excludes.Length);
-            foreach(string name in excludes)
+            foreach (string name in excludes)
             {
                 cs.ExcludeList.Add(name.Trim().ToLower());
             }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index a43a5f5..b3bfe07 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -89,7 +89,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 p_returnUuid = UUID.Zero;
             }
 
-            while(p_returnUuid == UUID.Zero)
+            while (p_returnUuid == UUID.Zero)
             {
                 Thread.Sleep(250);
             }
@@ -102,31 +102,37 @@ namespace OpenSim.Region.OptionalModules.World.NPC
         public void Autopilot(UUID agentID, Scene scene, Vector3 pos)
         {
             lock (m_avatars)
+            {
                 if (m_avatars.ContainsKey(agentID))
                 {
                     ScenePresence sp;
                     scene.TryGetAvatar(agentID, out sp);
                     sp.DoAutoPilot(0, pos, m_avatars[agentID]);
                 }
+            }
         }
 
         public void Say(UUID agentID, Scene scene, string text)
         {
             lock (m_avatars)
+            {
                 if (m_avatars.ContainsKey(agentID))
                 {
                     m_avatars[agentID].Say(text);
                 }
+            }
         }
 
         public void DeleteNPC(UUID agentID, Scene scene)
         {
-            lock(m_avatars)
+            lock (m_avatars)
+            {
                 if (m_avatars.ContainsKey(agentID))
                 {
                     scene.RemoveClient(agentID);
                     m_avatars.Remove(agentID);
                 }
+            }
         }
 
 
@@ -146,7 +152,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
                 {
                     p_inUse = false;
 
-
                     NPCAvatar npcAvatar = new NPCAvatar(p_firstname, p_lastname, p_position, p_scene);
                     npcAvatar.CircuitCode = (uint) Util.RandomClass.Next(0, int.MaxValue);
 
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 972e71c..16dd834 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1978,25 +1978,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
         }
 
-        private LSL_Rotation GetPartRot( SceneObjectPart part )
+        private LSL_Rotation GetPartRot(SceneObjectPart part)
         {
             Quaternion q;
             if (part.LinkNum == 0 || part.LinkNum == 1) // unlinked or root prim
             {
-                    if (part.ParentGroup.RootPart.AttachmentPoint != 0)
-                    {
-                        ScenePresence avatar = World.GetScenePresence(part.AttachedAvatar);
-                        if (avatar != null)
-                            if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
-                                q = avatar.CameraRotation; // Mouselook
-                            else
-                                q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
-                        else
-                            q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
-                    }
-                    else
-                        q = part.ParentGroup.GroupRotation; // just the group rotation
-                    return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
+                if (part.ParentGroup.RootPart.AttachmentPoint != 0)
+                {
+                    ScenePresence avatar = World.GetScenePresence(part.AttachedAvatar);
+                    if (avatar != null)
+                    {
+                        if ((avatar.AgentControlFlags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_MOUSELOOK) != 0)
+                            q = avatar.CameraRotation; // Mouselook
+                        else
+                            q = avatar.Rotation; // Currently infrequently updated so may be inaccurate
+                    }
+                    else
+                        q = part.ParentGroup.GroupRotation; // Likely never get here but just in case
+                }
+                else
+                    q = part.ParentGroup.GroupRotation; // just the group rotation
+                return new LSL_Rotation(q.X, q.Y, q.Z, q.W);
             }
             q = part.GetWorldRotation();
             return new LSL_Rotation(q.X, q.Y, q.Z, q.W);