diff options
author | Dan Lake | 2012-01-19 03:03:22 -0800 |
---|---|---|
committer | Dan Lake | 2012-01-19 03:03:22 -0800 |
commit | 5ced49aaa8ca4362ef8b17cb4f892da8c11d0e3f (patch) | |
tree | 2ed9a1dd0d0ae361ad7b43616b12611b073c40c3 /OpenSim/Region/Framework/Scenes | |
parent | Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID (diff) | |
download | opensim-SC_OLD-5ced49aaa8ca4362ef8b17cb4f892da8c11d0e3f.zip opensim-SC_OLD-5ced49aaa8ca4362ef8b17cb4f892da8c11d0e3f.tar.gz opensim-SC_OLD-5ced49aaa8ca4362ef8b17cb4f892da8c11d0e3f.tar.bz2 opensim-SC_OLD-5ced49aaa8ca4362ef8b17cb4f892da8c11d0e3f.tar.xz |
Cleaned up Color and Text parameters in SOP and made LocalFlags public for module access.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index aea47e6..a70c8fa 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -236,7 +236,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
236 | 236 | ||
237 | public bool IgnoreUndoUpdate = false; | 237 | public bool IgnoreUndoUpdate = false; |
238 | 238 | ||
239 | private PrimFlags LocalFlags; | 239 | public PrimFlags LocalFlags; |
240 | 240 | ||
241 | private float m_damage = -1.0f; | 241 | private float m_damage = -1.0f; |
242 | private byte[] m_TextureAnimation; | 242 | private byte[] m_TextureAnimation; |
@@ -904,32 +904,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
904 | public Color Color | 904 | public Color Color |
905 | { | 905 | { |
906 | get { return m_color; } | 906 | get { return m_color; } |
907 | set | 907 | set { m_color = value; } |
908 | { | ||
909 | m_color = value; | ||
910 | |||
911 | /* ScheduleFullUpdate() need not be called b/c after | ||
912 | * setting the color, the text will be set, so then | ||
913 | * ScheduleFullUpdate() will be called. */ | ||
914 | //ScheduleFullUpdate(); | ||
915 | } | ||
916 | } | 908 | } |
917 | 909 | ||
918 | public string Text | 910 | public string Text |
919 | { | 911 | { |
920 | get | 912 | get |
921 | { | 913 | { |
922 | string returnstr = m_text; | 914 | if (m_text.Length > 255) |
923 | if (returnstr.Length > 255) | 915 | return m_text.Substring(0, 254); |
924 | { | 916 | return m_text; |
925 | returnstr = returnstr.Substring(0, 254); | ||
926 | } | ||
927 | return returnstr; | ||
928 | } | ||
929 | set | ||
930 | { | ||
931 | m_text = value; | ||
932 | } | 917 | } |
918 | set { m_text = value; } | ||
933 | } | 919 | } |
934 | 920 | ||
935 | 921 | ||