diff options
author | Jeff Ames | 2008-09-23 23:14:00 +0000 |
---|---|---|
committer | Jeff Ames | 2008-09-23 23:14:00 +0000 |
commit | 3f79e6b3e766aa508858ee3fcec6f9b6403a35fc (patch) | |
tree | b4e753e9f19b7c90cf14aa3593bf788530e8605c /OpenSim | |
parent | couple of minor test cleanups to see if this gets us past the bamboo hump (diff) | |
download | opensim-SC_OLD-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.zip opensim-SC_OLD-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.tar.gz opensim-SC_OLD-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.tar.bz2 opensim-SC_OLD-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim')
7 files changed, 22 insertions, 22 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs index 8db3fde..82c0c2b 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | |||
@@ -397,8 +397,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
397 | 397 | ||
398 | if (rdata.userAppearance != null) | 398 | if (rdata.userAppearance != null) |
399 | { | 399 | { |
400 | modified = true; | 400 | modified = true; |
401 | Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance); | 401 | Rest.AvatarServices.UpdateUserAppearance(rdata.userProfile.ID, rdata.userAppearance); |
402 | } | 402 | } |
403 | 403 | ||
404 | if (created) | 404 | if (created) |
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs index dcd209f..9af5cd0 100644 --- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs +++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | |||
@@ -248,8 +248,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
248 | private void DoPut(AssetRequestData rdata) | 248 | private void DoPut(AssetRequestData rdata) |
249 | { | 249 | { |
250 | 250 | ||
251 | bool modified = false; | 251 | bool modified = false; |
252 | bool created = false; | 252 | bool created = false; |
253 | 253 | ||
254 | Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); | 254 | Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); |
255 | 255 | ||
@@ -269,7 +269,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
269 | AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); | 269 | AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); |
270 | 270 | ||
271 | modified = (asset != null); | 271 | modified = (asset != null); |
272 | created = !modified; | 272 | created = !modified; |
273 | 273 | ||
274 | asset = new AssetBase(); | 274 | asset = new AssetBase(); |
275 | asset.FullID = uuid; | 275 | asset.FullID = uuid; |
@@ -283,7 +283,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
283 | if (asset.ID != rdata.Parameters[0]) | 283 | if (asset.ID != rdata.Parameters[0]) |
284 | { | 284 | { |
285 | Rest.Log.WarnFormat("{0} URI and payload disagree on UUID U:{1} vs P:{2}", | 285 | Rest.Log.WarnFormat("{0} URI and payload disagree on UUID U:{1} vs P:{2}", |
286 | MsgId, rdata.Parameters[0], asset.ID); | 286 | MsgId, rdata.Parameters[0], asset.ID); |
287 | } | 287 | } |
288 | 288 | ||
289 | Rest.AssetServices.AddAsset(asset); | 289 | Rest.AssetServices.AddAsset(asset); |
@@ -323,8 +323,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
323 | private void DoPost(AssetRequestData rdata) | 323 | private void DoPost(AssetRequestData rdata) |
324 | { | 324 | { |
325 | 325 | ||
326 | bool modified = false; | 326 | bool modified = false; |
327 | bool created = false; | 327 | bool created = false; |
328 | 328 | ||
329 | Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); | 329 | Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); |
330 | 330 | ||
@@ -347,7 +347,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory | |||
347 | AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); | 347 | AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); |
348 | 348 | ||
349 | modified = (asset != null); | 349 | modified = (asset != null); |
350 | created = !modified; | 350 | created = !modified; |
351 | 351 | ||
352 | asset = new AssetBase(); | 352 | asset = new AssetBase(); |
353 | asset.FullID = uuid; | 353 | asset.FullID = uuid; |
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 | } |