aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2012-10-04 05:05:57 +0100
committerUbitUmarov2012-10-04 05:05:57 +0100
commit893b44497d5a5aa134f5e631071a47e64ea9863e (patch)
tree7358d5e36a7fda98c7629608af7a1acc0ffa292a
parent more changes. Most code not in use (diff)
parentFix a viewer crash issue (diff)
downloadopensim-SC-893b44497d5a5aa134f5e631071a47e64ea9863e.zip
opensim-SC-893b44497d5a5aa134f5e631071a47e64ea9863e.tar.gz
opensim-SC-893b44497d5a5aa134f5e631071a47e64ea9863e.tar.bz2
opensim-SC-893b44497d5a5aa134f5e631071a47e64ea9863e.tar.xz
Merge branch 'avination' into ubitwork
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs13
1 files changed, 12 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 05aaebf..adef0e6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4401,7 +4401,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4401 Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f), 4401 Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f),
4402 Util.Clip((float)color.y, 0.0f, 1.0f), 4402 Util.Clip((float)color.y, 0.0f, 1.0f),
4403 Util.Clip((float)color.z, 0.0f, 1.0f)); 4403 Util.Clip((float)color.z, 0.0f, 1.0f));
4404 m_host.SetText(text.Length > 254 ? text.Remove(254) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); 4404 if (text.Length > 254)
4405 text = text.Remove(254);
4406
4407 byte[] data;
4408 do
4409 {
4410 data = Util.UTF8.GetBytes(text);
4411 if (data.Length > 254)
4412 text = text.Substring(0, text.Length - 1);
4413 } while (data.Length > 254);
4414
4415 m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f));
4405 //m_host.ParentGroup.HasGroupChanged = true; 4416 //m_host.ParentGroup.HasGroupChanged = true;
4406 //m_host.ParentGroup.ScheduleGroupForFullUpdate(); 4417 //m_host.ParentGroup.ScheduleGroupForFullUpdate();
4407 } 4418 }