aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorBlueWall2012-03-01 14:20:46 -0500
committerBlueWall2012-03-01 14:20:46 -0500
commit7a88d21e59cbe8fbf0798ab15f7b71b7cc488531 (patch)
treec5323895714a992359f36012e76a323f4f009096
parentUse a fully stubbed out MockConsole for unit tests rather than inheriting fro... (diff)
parentFix indexing on string trim (diff)
downloadopensim-SC_OLD-7a88d21e59cbe8fbf0798ab15f7b71b7cc488531.zip
opensim-SC_OLD-7a88d21e59cbe8fbf0798ab15f7b71b7cc488531.tar.gz
opensim-SC_OLD-7a88d21e59cbe8fbf0798ab15f7b71b7cc488531.tar.bz2
opensim-SC_OLD-7a88d21e59cbe8fbf0798ab15f7b71b7cc488531.tar.xz
Merge branch 'master' of /home/opensim/src/opensim
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c5392b5..0003515 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4039,7 +4039,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4039 Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f), 4039 Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f),
4040 Util.Clip((float)color.y, 0.0f, 1.0f), 4040 Util.Clip((float)color.y, 0.0f, 1.0f),
4041 Util.Clip((float)color.z, 0.0f, 1.0f)); 4041 Util.Clip((float)color.z, 0.0f, 1.0f));
4042 m_host.SetText(text.Length > 254 ? text.Remove(255) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); 4042 m_host.SetText(text.Length > 254 ? text.Remove(254) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
4043 //m_host.ParentGroup.HasGroupChanged = true; 4043 //m_host.ParentGroup.HasGroupChanged = true;
4044 //m_host.ParentGroup.ScheduleGroupForFullUpdate(); 4044 //m_host.ParentGroup.ScheduleGroupForFullUpdate();
4045 } 4045 }