* Refactored out circular reference in Region.Environment <-> Framework.Data.Base

We REALLY need to get the db layer sorted soon...

5 files changed, 18 insertions, 15 deletions

diff --git a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
index b8bb7db..da33726 100644
--- a/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/AvatarFactoryModule.cs
@@ -32,7 +32,7 @@ using libsecondlife;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Framework.Data;
+using OpenSim.Framework.Data.MySQLMapper;
 using OpenSim.Region.Environment.Interfaces;
 using OpenSim.Region.Environment.Scenes;
 using OpenSim.Framework.Data.Base;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 2f2a1be..edb76e9 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1360,8 +1360,8 @@ namespace OpenSim.Region.Environment.Scenes
             SceneObjectPart part = GetChildPart(localID);
             if (part != null)
             {
-                part.Text = text;
-            }
+                part.SetText( text );
+            }            
         }
 
         public void SetPartText(string text, LLUUID partID)
@@ -1369,7 +1369,7 @@ namespace OpenSim.Region.Environment.Scenes
             SceneObjectPart part = GetChildPart(partID);
             if (part != null)
             {
-                part.Text = text;
+                part.SetText( text );
             }
         }
 
@@ -1905,12 +1905,6 @@ namespace OpenSim.Region.Environment.Scenes
             return null;
         }
 
-        public void UpdateText(string text)
-        {
-            m_rootPart.Text = text;
-            m_rootPart.ScheduleTerseUpdate();
-        }
-
         public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient)
         {
             if (m_rootPart.LocalId == localId)
@@ -1995,6 +1989,8 @@ namespace OpenSim.Region.Environment.Scenes
                                    (int) (color.y*0xff),
                                    (int) (color.z*0xff));
             Text = text;
+
+            m_rootPart.ScheduleFullUpdate();
         }
 
         public void ApplyPhysics(bool m_physicalPrim)
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index cbefc19..2c65a8f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -509,7 +509,6 @@ namespace OpenSim.Region.Environment.Scenes
             set
             {
                 m_text = value;
-                ScheduleFullUpdate();
             }
         }
 
@@ -2289,13 +2288,20 @@ namespace OpenSim.Region.Environment.Scenes
         {
         }
 
+
+        public void SetText(string text)
+        {
+            Text = text;
+            ScheduleFullUpdate();
+        }
+
         public void SetText(string text, Vector3 color, double alpha)
         {
             Color = Color.FromArgb(0xff - (int) (alpha*0xff),
                                    (int) (color.x*0xff),
                                    (int) (color.y*0xff),
                                    (int) (color.z*0xff));
-            Text = text;
+            SetText( text );
         }
 
         protected SceneObjectPart(SerializationInfo info, StreamingContext context)
@@ -2411,5 +2417,6 @@ namespace OpenSim.Region.Environment.Scenes
             info.AddValue("m_shape", m_shape);
             info.AddValue("m_parentGroup", m_parentGroup);
         }
+
     }
 }
diff --git a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
index 7a1e93f..34ed086 100644
--- a/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
+++ b/OpenSim/Region/Examples/SimpleModule/FileSystemObject.cs
@@ -38,7 +38,6 @@ namespace OpenSim.Region.Examples.SimpleModule
             : base(world, world.RegionInfo.RegionHandle, LLUUID.Zero, world.NextLocalId, pos, PrimitiveBaseShape.Default)
         {
             Text = fileInfo.Name;
-            ScheduleGroupForFullUpdate();
         }
 
         protected override bool InSceneBackup
diff --git a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
index 32477f4..3b21d43 100644
--- a/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
+++ b/OpenSim/Region/Examples/SimpleModule/RegionModule.cs
@@ -55,8 +55,8 @@ namespace OpenSim.Region.Examples.SimpleModule
             LLVector3 pos = new LLVector3(110, 129, 27);
 
             AddCpuCounter(regionInfo, pos);
-            AddComplexObjects(regionInfo, pos);
-            AddAvatars();
+          //  AddComplexObjects(regionInfo, pos);
+           // AddAvatars();
             AddFileSystemObjects();
         }
 
@@ -79,6 +79,7 @@ namespace OpenSim.Region.Examples.SimpleModule
 
                 FileSystemObject fileObject = new FileSystemObject(m_scene, fileInfo, filePos);
                 m_scene.AddEntity(fileObject);
+                fileObject.ScheduleGroupForFullUpdate();
             }
         }