aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-10-13 20:45:13 +0000
committerJustin Clarke Casey2008-10-13 20:45:13 +0000
commit9d6f043a7988cafb30831fa678f6151f1c34860e (patch)
tree596171e337f23d2f717fc083190c5e32f71abaac
parent* Apply a modified version of the part of http://opensimulator.org/mantis/vie... (diff)
downloadopensim-SC_OLD-9d6f043a7988cafb30831fa678f6151f1c34860e.zip
opensim-SC_OLD-9d6f043a7988cafb30831fa678f6151f1c34860e.tar.gz
opensim-SC_OLD-9d6f043a7988cafb30831fa678f6151f1c34860e.tar.bz2
opensim-SC_OLD-9d6f043a7988cafb30831fa678f6151f1c34860e.tar.xz
* Remove warnings, including one which pointed out a bug
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs1
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 9e41531..1b0ea6f 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.Environment.Scenes
249 /// </returns> 249 /// </returns>
250 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup) 250 protected bool AddSceneObject(SceneObjectGroup sceneObject, bool attachToBackup)
251 { 251 {
252 if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == null) 252 if (sceneObject == null || sceneObject.RootPart == null || sceneObject.RootPart.UUID == UUID.Zero)
253 return false; 253 return false;
254 254
255 sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim); 255 sceneObject.ApplyPhysics(m_parentScene.m_physicalPrim);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
index 68c7392..8b3bc59 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
@@ -277,7 +277,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Plugins
277 Vector3 ZeroVector = new Vector3(0, 0, 0); 277 Vector3 ZeroVector = new Vector3(0, 0, 0);
278 278
279 bool nameSearch = (ts.name != null && ts.name != ""); 279 bool nameSearch = (ts.name != null && ts.name != "");
280 SceneObjectGroup group;
281 280
282 foreach (EntityBase ent in Entities) 281 foreach (EntityBase ent in Entities)
283 { 282 {