aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs19
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs6
4 files changed, 24 insertions, 4 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 6e26c0e..80bff17 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -439,6 +439,7 @@ namespace OpenSim
439 { 439 {
440 scene.SnmpService.BootInfo("Grid Registration in progress", scene); 440 scene.SnmpService.BootInfo("Grid Registration in progress", scene);
441 } 441 }
442
442 try 443 try
443 { 444 {
444 scene.RegisterRegionWithGrid(); 445 scene.RegisterRegionWithGrid();
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 4daabd2..9b31fac 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2006,6 +2006,7 @@ namespace OpenSim.Region.Framework.Scenes
2006 /// If true, the object is made persistent into the scene. 2006 /// If true, the object is made persistent into the scene.
2007 /// If false, the object will not persist over server restarts 2007 /// If false, the object will not persist over server restarts
2008 /// </param> 2008 /// </param>
2009 /// <returns>true if the object was added. false if not</returns>
2009 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) 2010 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
2010 { 2011 {
2011 return AddNewSceneObject(sceneObject, attachToBackup, true); 2012 return AddNewSceneObject(sceneObject, attachToBackup, true);
@@ -2023,6 +2024,7 @@ namespace OpenSim.Region.Framework.Scenes
2023 /// If true, updates for the new scene object are sent to all viewers in range. 2024 /// If true, updates for the new scene object are sent to all viewers in range.
2024 /// If false, it is left to the caller to schedule the update 2025 /// If false, it is left to the caller to schedule the update
2025 /// </param> 2026 /// </param>
2027 /// <returns>true if the object was added. false if not</returns>
2026 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 2028 public bool AddNewSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
2027 { 2029 {
2028 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates)) 2030 if (m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, sendClientUpdates))
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ea2caaf..aecca27 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -395,11 +395,28 @@ namespace OpenSim.Region.Framework.Scenes
395 /// </returns> 395 /// </returns>
396 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates) 396 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup, bool sendClientUpdates)
397 { 397 {
398 if (sceneObject == null || sceneObject.RootPart.UUID == UUID.Zero) 398 if (sceneObject == null)
399 {
400 m_log.ErrorFormat("[SCENEGRAPH]: Tried to add null scene object");
401 return false;
402 }
403 if (sceneObject.UUID == UUID.Zero)
404 {
405 m_log.ErrorFormat(
406 "[SCENEGRAPH]: Tried to add scene object {0} to {1} with illegal UUID of {2}",
407 sceneObject.Name, m_parentScene.RegionInfo.RegionName, UUID.Zero);
408
399 return false; 409 return false;
410 }
400 411
401 if (Entities.ContainsKey(sceneObject.UUID)) 412 if (Entities.ContainsKey(sceneObject.UUID))
413 {
414// m_log.DebugFormat(
415// "[SCENEGRAPH]: Scene graph for {0} already contains object {1} in AddSceneObject()",
416// m_parentScene.RegionInfo.RegionName, sceneObject.UUID);
417
402 return false; 418 return false;
419 }
403 420
404// m_log.DebugFormat( 421// m_log.DebugFormat(
405// "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}", 422// "[SCENEGRAPH]: Adding scene object {0} {1}, with {2} parts on {3}",
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)