diff options
Diffstat (limited to 'OpenSim/Region')
5 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 62d6efe..27e2e5c 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -5286,7 +5286,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5286 | break; | 5286 | break; |
5287 | 5287 | ||
5288 | case PacketType.RezScript: | 5288 | case PacketType.RezScript: |
5289 | m_log.DebugFormat("[AMW] RezScript"); | 5289 | m_log.DebugFormat("[AMW] RezScript"); |
5290 | //Console.WriteLine(Pack.ToString()); | 5290 | //Console.WriteLine(Pack.ToString()); |
5291 | RezScriptPacket rezScriptx = (RezScriptPacket)Pack; | 5291 | RezScriptPacket rezScriptx = (RezScriptPacket)Pack; |
5292 | 5292 | ||
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 9ce6a77..16743ea 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -612,7 +612,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
612 | 612 | ||
613 | // TODO: add group support! | 613 | // TODO: add group support! |
614 | // | 614 | // |
615 | if(part.OwnerID != editorID) | 615 | if (part.OwnerID != editorID) |
616 | return false; | 616 | return false; |
617 | 617 | ||
618 | return GenericObjectPermission(editorID, objectID, false); | 618 | return GenericObjectPermission(editorID, objectID, false); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index c1c1b6e..015b140 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1201,9 +1201,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1201 | if (part != null) | 1201 | if (part != null) |
1202 | { | 1202 | { |
1203 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) | 1203 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) |
1204 | { | 1204 | { |
1205 | return; | 1205 | return; |
1206 | } | 1206 | } |
1207 | 1207 | ||
1208 | TaskInventoryItem currentItem = part.GetInventoryItem(itemID); | 1208 | TaskInventoryItem currentItem = part.GetInventoryItem(itemID); |
1209 | 1209 | ||
@@ -1296,10 +1296,10 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T | |||
1296 | SceneObjectPart part = GetSceneObjectPart(localID); | 1296 | SceneObjectPart part = GetSceneObjectPart(localID); |
1297 | if (part != null) | 1297 | if (part != null) |
1298 | { | 1298 | { |
1299 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) | 1299 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) |
1300 | { | 1300 | { |
1301 | return; | 1301 | return; |
1302 | } | 1302 | } |
1303 | 1303 | ||
1304 | part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); | 1304 | part.ParentGroup.AddInventoryItem(remoteClient, localID, item, copyID); |
1305 | // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez | 1305 | // TODO: set this to "true" when scripts in inventory have persistent state to fire on_rez |
diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs index b16577d..c4b0fd4 100644 --- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/LSL/CSCodeGenerator.cs | |||
@@ -730,11 +730,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler.LSL | |||
730 | c.Value = c.Value.Insert(dotIndex, "0"); | 730 | c.Value = c.Value.Insert(dotIndex, "0"); |
731 | c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; | 731 | c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; |
732 | } | 732 | } |
733 | else if("LSL_Types.LSLInteger" == c.Type) | 733 | else if ("LSL_Types.LSLInteger" == c.Type) |
734 | { | 734 | { |
735 | c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; | 735 | c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; |
736 | } | 736 | } |
737 | else if("LSL_Types.LSLString" == c.Type) | 737 | else if ("LSL_Types.LSLString" == c.Type) |
738 | { | 738 | { |
739 | c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; | 739 | c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; |
740 | } | 740 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs index 5a98f4d..86d6188 100644 --- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs +++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/CSCodeGenerator.cs | |||
@@ -730,11 +730,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools | |||
730 | c.Value = c.Value.Insert(dotIndex, "0"); | 730 | c.Value = c.Value.Insert(dotIndex, "0"); |
731 | c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; | 731 | c.Value = "new LSL_Types.LSLFloat("+c.Value+")"; |
732 | } | 732 | } |
733 | else if("LSL_Types.LSLInteger" == c.Type) | 733 | else if ("LSL_Types.LSLInteger" == c.Type) |
734 | { | 734 | { |
735 | c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; | 735 | c.Value = "new LSL_Types.LSLInteger("+c.Value+")"; |
736 | } | 736 | } |
737 | else if("LSL_Types.LSLString" == c.Type) | 737 | else if ("LSL_Types.LSLString" == c.Type) |
738 | { | 738 | { |
739 | c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; | 739 | c.Value = "new LSL_Types.LSLString(\""+c.Value+"\")"; |
740 | } | 740 | } |