aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorlbsa712008-03-25 14:27:39 +0000
committerlbsa712008-03-25 14:27:39 +0000
commitba2de258f420245d07c4d194f8f8a71abe299aff (patch)
tree7292d4f76a631898ddfe765968888206d5390677 /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentAdd "warnings as errors" support for nant and monodevelop to Prebuild (though... (diff)
downloadopensim-SC-ba2de258f420245d07c4d194f8f8a71abe299aff.zip
opensim-SC-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.gz
opensim-SC-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.bz2
opensim-SC-ba2de258f420245d07c4d194f8f8a71abe299aff.tar.xz
* Refactored out circular reference in Region.Environment <-> Framework.Data.Base
We REALLY need to get the db layer sorted soon...
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs14
1 files changed, 5 insertions, 9 deletions
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
1360 SceneObjectPart part = GetChildPart(localID); 1360 SceneObjectPart part = GetChildPart(localID);
1361 if (part != null) 1361 if (part != null)
1362 { 1362 {
1363 part.Text = text; 1363 part.SetText( text );
1364 } 1364 }
1365 } 1365 }
1366 1366
1367 public void SetPartText(string text, LLUUID partID) 1367 public void SetPartText(string text, LLUUID partID)
@@ -1369,7 +1369,7 @@ namespace OpenSim.Region.Environment.Scenes
1369 SceneObjectPart part = GetChildPart(partID); 1369 SceneObjectPart part = GetChildPart(partID);
1370 if (part != null) 1370 if (part != null)
1371 { 1371 {
1372 part.Text = text; 1372 part.SetText( text );
1373 } 1373 }
1374 } 1374 }
1375 1375
@@ -1905,12 +1905,6 @@ namespace OpenSim.Region.Environment.Scenes
1905 return null; 1905 return null;
1906 } 1906 }
1907 1907
1908 public void UpdateText(string text)
1909 {
1910 m_rootPart.Text = text;
1911 m_rootPart.ScheduleTerseUpdate();
1912 }
1913
1914 public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient) 1908 public void ObjectGrabHandler(uint localId, LLVector3 offsetPos, IClientAPI remoteClient)
1915 { 1909 {
1916 if (m_rootPart.LocalId == localId) 1910 if (m_rootPart.LocalId == localId)
@@ -1995,6 +1989,8 @@ namespace OpenSim.Region.Environment.Scenes
1995 (int) (color.y*0xff), 1989 (int) (color.y*0xff),
1996 (int) (color.z*0xff)); 1990 (int) (color.z*0xff));
1997 Text = text; 1991 Text = text;
1992
1993 m_rootPart.ScheduleFullUpdate();
1998 } 1994 }
1999 1995
2000 public void ApplyPhysics(bool m_physicalPrim) 1996 public void ApplyPhysics(bool m_physicalPrim)