diff options
author | Melanie Thielker | 2008-09-22 12:52:56 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-22 12:52:56 +0000 |
commit | d7a98925ce5693f28ef48e4228680f3a7aba12af (patch) | |
tree | 2e20488ce767f98b586593b434d21e0b9e398d27 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |
parent | cleanups in inventory REST code. also, disables digest authentications (diff) | |
download | opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.zip opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.tar.gz opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.tar.bz2 opensim-SC_OLD-d7a98925ce5693f28ef48e4228680f3a7aba12af.tar.xz |
Create CanEditObjectInventory to preserve the ability
to have different permissions on inventory and object
edits. This may be needed by the viewer on public grids
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs index a188701..a1c5fe7 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs | |||
@@ -1186,18 +1186,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1186 | 1186 | ||
1187 | if (part != null) | 1187 | if (part != null) |
1188 | { | 1188 | { |
1189 | 1189 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) | |
1190 | // replacing the following two checks with the | ||
1191 | // ExternalChecks.ExternalChecksCanEditObject(...) | ||
1192 | // call | ||
1193 | |||
1194 | // if (part.OwnerID != remoteClient.AgentId) | ||
1195 | // return; | ||
1196 | |||
1197 | // if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) | ||
1198 | // return; | ||
1199 | |||
1200 | if (!ExternalChecks.ExternalChecksCanEditObject(part.UUID, remoteClient.AgentId)) | ||
1201 | { | 1190 | { |
1202 | return; | 1191 | return; |
1203 | } | 1192 | } |
@@ -1293,20 +1282,7 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T | |||
1293 | SceneObjectPart part = GetSceneObjectPart(localID); | 1282 | SceneObjectPart part = GetSceneObjectPart(localID); |
1294 | if (part != null) | 1283 | if (part != null) |
1295 | { | 1284 | { |
1296 | 1285 | if (!ExternalChecks.ExternalChecksCanEditObjectInventory(part.UUID, remoteClient.AgentId)) | |
1297 | /* | ||
1298 | if (part.OwnerID != remoteClient.AgentId) | ||
1299 | { | ||
1300 | return; | ||
1301 | } | ||
1302 | |||
1303 | if ((part.OwnerMask & (uint)PermissionMask.Modify) == 0) | ||
1304 | { | ||
1305 | return; | ||
1306 | } | ||
1307 | */ | ||
1308 | |||
1309 | if (!ExternalChecks.ExternalChecksCanEditObject(part.UUID, remoteClient.AgentId)) | ||
1310 | { | 1286 | { |
1311 | return; | 1287 | return; |
1312 | } | 1288 | } |