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/Region/Environment/Scenes | |
| 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/Region/Environment/Scenes')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 14 |
1 files changed, 7 insertions, 7 deletions
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 |