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/ApplicationPlugins | |
parent | couple of minor test cleanups to see if this gets us past the bamboo hump (diff) | |
download | opensim-SC-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.zip opensim-SC-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.tar.gz opensim-SC-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.tar.bz2 opensim-SC-3f79e6b3e766aa508858ee3fcec6f9b6403a35fc.tar.xz |
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs | 4 | ||||
-rw-r--r-- | OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs | 14 |
2 files changed, 9 insertions, 9 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; |