diff options
author | lbsa71 | 2008-03-25 14:27:39 +0000 |
---|---|---|
committer | lbsa71 | 2008-03-25 14:27:39 +0000 |
commit | ba2de258f420245d07c4d194f8f8a71abe299aff (patch) | |
tree | 7292d4f76a631898ddfe765968888206d5390677 /OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |
parent | Add "warnings as errors" support for nant and monodevelop to Prebuild (though... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 11 |
1 files changed, 9 insertions, 2 deletions
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 | } |