diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 14 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 11 |
2 files changed, 14 insertions, 11 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) |
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 | |||
509 | set | 509 | set |
510 | { | 510 | { |
511 | m_text = value; | 511 | m_text = value; |
512 | ScheduleFullUpdate(); | ||
513 | } | 512 | } |
514 | } | 513 | } |
515 | 514 | ||
@@ -2289,13 +2288,20 @@ namespace OpenSim.Region.Environment.Scenes | |||
2289 | { | 2288 | { |
2290 | } | 2289 | } |
2291 | 2290 | ||
2291 | |||
2292 | public void SetText(string text) | ||
2293 | { | ||
2294 | Text = text; | ||
2295 | ScheduleFullUpdate(); | ||
2296 | } | ||
2297 | |||
2292 | public void SetText(string text, Vector3 color, double alpha) | 2298 | public void SetText(string text, Vector3 color, double alpha) |
2293 | { | 2299 | { |
2294 | Color = Color.FromArgb(0xff - (int) (alpha*0xff), | 2300 | Color = Color.FromArgb(0xff - (int) (alpha*0xff), |
2295 | (int) (color.x*0xff), | 2301 | (int) (color.x*0xff), |
2296 | (int) (color.y*0xff), | 2302 | (int) (color.y*0xff), |
2297 | (int) (color.z*0xff)); | 2303 | (int) (color.z*0xff)); |
2298 | Text = text; | 2304 | SetText( text ); |
2299 | } | 2305 | } |
2300 | 2306 | ||
2301 | protected SceneObjectPart(SerializationInfo info, StreamingContext context) | 2307 | protected SceneObjectPart(SerializationInfo info, StreamingContext context) |
@@ -2411,5 +2417,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
2411 | info.AddValue("m_shape", m_shape); | 2417 | info.AddValue("m_shape", m_shape); |
2412 | info.AddValue("m_parentGroup", m_parentGroup); | 2418 | info.AddValue("m_parentGroup", m_parentGroup); |
2413 | } | 2419 | } |
2420 | |||
2414 | } | 2421 | } |
2415 | } | 2422 | } |