diff options
| author | Melanie | 2012-10-03 17:39:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-03 17:39:13 +0100 |
| commit | 653a98e891dcd97b55010900bacc4d033958756a (patch) | |
| tree | 50196bcb4ebf4d622dc9726cf988750336b162ec /OpenSim/Region | |
| parent | I propose that 0.5m/step change for linear velocity is too big of a change to... (diff) | |
| download | opensim-SC_OLD-653a98e891dcd97b55010900bacc4d033958756a.zip opensim-SC_OLD-653a98e891dcd97b55010900bacc4d033958756a.tar.gz opensim-SC_OLD-653a98e891dcd97b55010900bacc4d033958756a.tar.bz2 opensim-SC_OLD-653a98e891dcd97b55010900bacc4d033958756a.tar.xz | |
Fix a viewer crash issue
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 13 |
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 52d96bc..7fa6f05 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4006,7 +4006,18 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4006 | { | 4006 | { |
| 4007 | m_host.AddScriptLPS(1); | 4007 | m_host.AddScriptLPS(1); |
| 4008 | Vector3 av3 = Util.Clip(color, 0.0f, 1.0f); | 4008 | Vector3 av3 = Util.Clip(color, 0.0f, 1.0f); |
| 4009 | m_host.SetText(text.Length > 254 ? text.Remove(254) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); | 4009 | if (text.Length > 254) |
| 4010 | text = text.Remove(254); | ||
| 4011 | |||
| 4012 | byte[] data; | ||
| 4013 | do | ||
| 4014 | { | ||
| 4015 | data = Util.UTF8.GetBytes(text); | ||
| 4016 | if (data.Length > 254) | ||
| 4017 | text = text.Substring(0, text.Length - 1); | ||
| 4018 | } while (data.Length > 254); | ||
| 4019 | |||
| 4020 | m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); | ||
| 4010 | //m_host.ParentGroup.HasGroupChanged = true; | 4021 | //m_host.ParentGroup.HasGroupChanged = true; |
| 4011 | //m_host.ParentGroup.ScheduleGroupForFullUpdate(); | 4022 | //m_host.ParentGroup.ScheduleGroupForFullUpdate(); |
| 4012 | } | 4023 | } |