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

OpenSim/Data/PGSQL/PGSQLRegionData.cs

@@ -206,7 +206,7 @@ namespace OpenSim.Data.PGSQL
 
                     DataTable schemaTable = result.GetSchemaTable();
                     foreach (DataRow row in schemaTable.Rows)
-                        m_ColumnNames.Add(row["ColumnName"].ToString());
+                        m_ColumnNames.Add(row["column_name"].ToString());
                 }
 
                 foreach (string s in m_ColumnNames)
@@ -376,7 +376,7 @@ namespace OpenSim.Data.PGSQL
 
         private List<RegionData> Get(int regionFlags, UUID scopeID)
         {
-            string sql = "SELECT * FROM " + m_Realm + " WHERE (flags & " + regionFlags.ToString() + ") <> 0";
+            string sql = "SELECT * FROM " + m_Realm + " WHERE (\"flags\" & " + regionFlags.ToString() + ") <> 0";
             if (scopeID != UUID.Zero)
                 sql += " AND \"ScopeID\" = :scopeID";
 

OpenSim/Region/Application/OpenSim.cs

@@ -296,6 +296,11 @@ namespace OpenSim
                                           "Change the scale of a named prim", 
                                           HandleEditScale);
 
+            m_console.Commands.AddCommand("Objects", false, "rotate scene",
+                                          "rotate scene <degrees>",
+                                          "Rotates all scene objects around x:128, y:128",
+                                          HandleRotateScene);
+
             m_console.Commands.AddCommand("Users", false, "kick user",
                                           "kick user <first> <last> [--force] [message]",
                                           "Kick a user off the simulator",
@@ -505,6 +510,45 @@ namespace OpenSim
             }
         }
 
+        private void HandleRotateScene(string module, string[] args)
+        {
+            string usage = "Usage: rotate scene <angle in degrees> [centerX centerY] (centerX and centerY are optional and default to Constants.RegionSize / 2";
+
+            float centerX = Constants.RegionSize * 0.5f;
+            float centerY = Constants.RegionSize * 0.5f;
+
+            if (args.Length < 3 || args.Length == 4)
+            {
+                MainConsole.Instance.Output(usage);
+                return;
+            }
+            
+            float angle = (float)(Convert.ToSingle(args[2]) / 180.0 * Math.PI);
+            OpenMetaverse.Quaternion rot = OpenMetaverse.Quaternion.CreateFromAxisAngle(0, 0, 1, angle);
+
+            if (args.Length > 4)
+            {
+                centerX = Convert.ToSingle(args[3]);
+                centerY = Convert.ToSingle(args[4]);
+            }
+
+            Vector3 center = new Vector3(centerX, centerY, 0.0f);
+
+            SceneManager.ForEachSelectedScene(delegate(Scene scene) 
+            {
+                scene.ForEachSOG(delegate(SceneObjectGroup sog)
+                {
+                    if (sog.AttachmentPoint == 0)
+                    {
+                        sog.RootPart.UpdateRotation(rot * sog.GroupRotation);
+                        Vector3 offset = sog.AbsolutePosition - center;
+                        offset *= rot;
+                        sog.UpdateGroupPosition(center + offset);
+                    }
+                });
+            });
+        }
+
         /// <summary>
         /// Creates a new region based on the parameters specified.   This will ask the user questions on the console
         /// </summary>

OpenSim/Region/OptionalModules/Scripting/RegionReadyModule/RegionReadyModule.cs

@@ -105,7 +105,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 m_scene.LoginLock = true;
                 m_scene.EventManager.OnEmptyScriptCompileQueue += OnEmptyScriptCompileQueue;
 
-                m_log.InfoFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
+                // Warn level because the region cannot be used while logins are disabled
+                m_log.WarnFormat("[RegionReady]: Region {0} - LOGINS DISABLED DURING INITIALIZATION.", m_scene.Name);
 
                 if (m_uri != string.Empty)
                 {
@@ -215,7 +216,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.RegionReady
                 // m_log.InfoFormat("[RegionReady]: Logins enabled for {0}, Oar {1}",
                 //                 m_scene.RegionInfo.RegionName, m_oarFileLoading.ToString());
 
-                m_log.InfoFormat(
+                // Warn level because the region cannot be used while logins are disabled
+                m_log.WarnFormat(
                     "[RegionReady]: INITIALIZATION COMPLETE FOR {0} - LOGINS ENABLED", m_scene.Name);
             }