aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs84
4 files changed, 48 insertions, 48 deletions
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
index cc088a0..03bbaf3 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory
54 54
55 public void Initialise(Scene scene, IConfigSource config) 55 public void Initialise(Scene scene, IConfigSource config)
56 { 56 {
57 if(!m_Scenelist.Contains(scene)) 57 if (!m_Scenelist.Contains(scene))
58 { 58 {
59 m_Scenelist.Add(scene); 59 m_Scenelist.Add(scene);
60 60
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index bdfe664..d534ffc 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
148 public void DeselectPrim(uint primLocalID, IClientAPI remoteClient) 148 public void DeselectPrim(uint primLocalID, IClientAPI remoteClient)
149 { 149 {
150 SceneObjectPart part = GetSceneObjectPart(primLocalID); 150 SceneObjectPart part = GetSceneObjectPart(primLocalID);
151 if(part == null) 151 if (part == null)
152 return; 152 return;
153 153
154 bool isAttachment = false; 154 bool isAttachment = false;
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Environment.Scenes
159 // 159 //
160 if (part.ParentGroup == null) 160 if (part.ParentGroup == null)
161 { 161 {
162 if(part.IsAttachment) 162 if (part.IsAttachment)
163 isAttachment = true; 163 isAttachment = true;
164 else 164 else
165 part.ScheduleFullUpdate(); 165 part.ScheduleFullUpdate();
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index d6aef95..1432912 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1177,7 +1177,7 @@ namespace OpenSim.Region.Environment.Scenes
1177 1177
1178 public void ClearUndoState() 1178 public void ClearUndoState()
1179 { 1179 {
1180 lock(m_undo) 1180 lock (m_undo)
1181 { 1181 {
1182 m_undo.Clear(); 1182 m_undo.Clear();
1183 } 1183 }
@@ -2449,7 +2449,7 @@ namespace OpenSim.Region.Environment.Scenes
2449 { 2449 {
2450 if (m_parentGroup != null) 2450 if (m_parentGroup != null)
2451 { 2451 {
2452 lock(m_undo) 2452 lock (m_undo)
2453 { 2453 {
2454 if (m_undo.Count > 0) 2454 if (m_undo.Count > 0)
2455 { 2455 {
@@ -2958,7 +2958,7 @@ namespace OpenSim.Region.Environment.Scenes
2958 2958
2959 public void Undo() 2959 public void Undo()
2960 { 2960 {
2961 lock(m_undo) 2961 lock (m_undo)
2962 { 2962 {
2963 if (m_undo.Count > 0) 2963 if (m_undo.Count > 0)
2964 { 2964 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index c8c1ac3..9604828 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5536,48 +5536,48 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5536 5536
5537 SetFullBright(part, face , st); 5537 SetFullBright(part, face , st);
5538 break; 5538 break;
5539 case (int)ScriptBaseClass.PRIM_MATERIAL: 5539 case (int)ScriptBaseClass.PRIM_MATERIAL:
5540 if (remain < 1) 5540 if (remain < 1)
5541 return; 5541 return;
5542 if (part != null) 5542 if (part != null)
5543 { 5543 {
5544 /* Unhandled at this time - sends "Unhandled" message 5544 /* Unhandled at this time - sends "Unhandled" message
5545 will enable when available 5545 will enable when available
5546 byte material = (byte)Convert.ToByte( rules.Data[idx++]); 5546 byte material = (byte)Convert.ToByte( rules.Data[idx++]);
5547 part.Material = material; 5547 part.Material = material;
5548 */ 5548 */
5549 return; 5549 return;
5550 } 5550 }
5551 break; 5551 break;
5552 case (int)ScriptBaseClass.PRIM_PHANTOM: 5552 case (int)ScriptBaseClass.PRIM_PHANTOM:
5553 if (remain < 1) 5553 if (remain < 1)
5554 return; 5554 return;
5555 5555
5556 string ph = rules.Data[idx++].ToString(); 5556 string ph = rules.Data[idx++].ToString();
5557 bool phantom; 5557 bool phantom;
5558 5558
5559 if(ph.Equals("1")) 5559 if (ph.Equals("1"))
5560 phantom = true; 5560 phantom = true;
5561 else 5561 else
5562 phantom = false; 5562 phantom = false;
5563 5563
5564 part.ScriptSetPhantomStatus(phantom); 5564 part.ScriptSetPhantomStatus(phantom);
5565 part.ScheduleFullUpdate(); 5565 part.ScheduleFullUpdate();
5566 break; 5566 break;
5567 case (int)ScriptBaseClass.PRIM_PHYSICS: 5567 case (int)ScriptBaseClass.PRIM_PHYSICS:
5568 if (remain < 1) 5568 if (remain < 1)
5569 return; 5569 return;
5570 string phy = rules.Data[idx++].ToString(); 5570 string phy = rules.Data[idx++].ToString();
5571 bool physics; 5571 bool physics;
5572 5572
5573 if(phy.Equals("1")) 5573 if (phy.Equals("1"))
5574 physics = true; 5574 physics = true;
5575 else 5575 else
5576 physics = false; 5576 physics = false;
5577 5577
5578 m_host.ScriptSetPhysicsStatus(physics); 5578 m_host.ScriptSetPhysicsStatus(physics);
5579 part.ScheduleFullUpdate(); 5579 part.ScheduleFullUpdate();
5580 break; 5580 break;
5581 } 5581 }
5582 } 5582 }
5583 } 5583 }