diff options
| author | Melanie | 2012-01-31 20:53:49 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-31 20:53:49 +0000 |
| commit | 1b63b21a4db192cdfb24748be523dd53bbba47a9 (patch) | |
| tree | a9c45afd55fb652e35c9a703560c7e35af2cdfa6 /OpenSim/Region/ScriptEngine | |
| parent | Make parcel sale overlays work. No auction support. (diff) | |
| parent | Remove scene object null check on SceneGraph.AddSceneObject(). Complain expl... (diff) | |
| download | opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.zip opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.gz opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.bz2 opensim-SC-1b63b21a4db192cdfb24748be523dd53bbba47a9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 01e5dbe..7ed41f2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -4395,9 +4395,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 4395 | Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f), | 4395 | Vector3 av3 = new Vector3(Util.Clip((float)color.x, 0.0f, 1.0f), |
| 4396 | Util.Clip((float)color.y, 0.0f, 1.0f), | 4396 | Util.Clip((float)color.y, 0.0f, 1.0f), |
| 4397 | Util.Clip((float)color.z, 0.0f, 1.0f)); | 4397 | Util.Clip((float)color.z, 0.0f, 1.0f)); |
| 4398 | m_host.SetText(text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); | 4398 | m_host.SetText(text.Length > 254 ? text.Remove(255) : text, av3, Util.Clip((float)alpha, 0.0f, 1.0f)); |
| 4399 | m_host.ParentGroup.HasGroupChanged = true; | 4399 | //m_host.ParentGroup.HasGroupChanged = true; |
| 4400 | m_host.ParentGroup.ScheduleGroupForFullUpdate(); | 4400 | //m_host.ParentGroup.ScheduleGroupForFullUpdate(); |
| 4401 | } | 4401 | } |
| 4402 | 4402 | ||
| 4403 | public LSL_Float llWater(LSL_Vector offset) | 4403 | public LSL_Float llWater(LSL_Vector offset) |