diff options
author | Charles Krinke | 2008-06-28 16:08:12 +0000 |
---|---|---|
committer | Charles Krinke | 2008-06-28 16:08:12 +0000 |
commit | 9a0ef22ed979433f4d017a252173f38fe5e56892 (patch) | |
tree | 98bd25e3a49a38922b37728df4de9e0fa5b7366a /OpenSim/Region/Environment/Modules/World | |
parent | plumbing for multiple inventory servers. Mostly done on the region server side. (diff) | |
download | opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.zip opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.gz opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.bz2 opensim-SC-9a0ef22ed979433f4d017a252173f38fe5e56892.tar.xz |
Mantis#1616. Applied Melanie's patch. This may or may
not break trunk.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs index 83d4603..5d94407 100644 --- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs | |||
@@ -291,6 +291,8 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
291 | public event EstateDebugRegionRequest OnEstateDebugRegionRequest; | 291 | public event EstateDebugRegionRequest OnEstateDebugRegionRequest; |
292 | public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; | 292 | public event EstateTeleportOneUserHomeRequest OnEstateTeleportOneUserHomeRequest; |
293 | public event ScriptReset OnScriptReset; | 293 | public event ScriptReset OnScriptReset; |
294 | public event GetScriptRunning OnGetScriptRunning; | ||
295 | public event SetScriptRunning OnSetScriptRunning; | ||
294 | public event UpdateVector OnAutoPilotGo; | 296 | public event UpdateVector OnAutoPilotGo; |
295 | 297 | ||
296 | #pragma warning restore 67 | 298 | #pragma warning restore 67 |
@@ -783,6 +785,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC | |||
783 | { | 785 | { |
784 | } | 786 | } |
785 | 787 | ||
788 | public void SendScriptRunningReply(LLUUID objectID, LLUUID itemID, bool running) | ||
789 | { | ||
790 | } | ||
791 | |||
786 | public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia) | 792 | public void SendLandStatReply(uint reportType, uint requestFlags, uint resultCount, LandStatReportItem[] lsrpia) |
787 | { | 793 | { |
788 | } | 794 | } |
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index d6ee739..6cf2f29 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
@@ -300,6 +300,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
300 | LLObject.ObjectFlags.ObjectMove | // tells client that you can move the object (only, no mod) | 300 | LLObject.ObjectFlags.ObjectMove | // tells client that you can move the object (only, no mod) |
301 | LLObject.ObjectFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it | 301 | LLObject.ObjectFlags.ObjectTransfer | // tells the client that you can /take/ the object if you don't own it |
302 | LLObject.ObjectFlags.ObjectYouOwner | // Tells client that you're the owner of the object | 302 | LLObject.ObjectFlags.ObjectYouOwner | // Tells client that you're the owner of the object |
303 | LLObject.ObjectFlags.ObjectAnyOwner | // Tells client that someone owns the object | ||
303 | LLObject.ObjectFlags.ObjectOwnerModify | // Tells client that you're the owner of the object | 304 | LLObject.ObjectFlags.ObjectOwnerModify | // Tells client that you're the owner of the object |
304 | LLObject.ObjectFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set | 305 | LLObject.ObjectFlags.ObjectYouOfficer // Tells client that you've got group object editing permission. Used when ObjectGroupOwned is set |
305 | ); | 306 | ); |
@@ -307,7 +308,7 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
307 | // Creating the three ObjectFlags options for this method to choose from. | 308 | // Creating the three ObjectFlags options for this method to choose from. |
308 | // Customize the OwnerMask | 309 | // Customize the OwnerMask |
309 | uint objectOwnerMask = ApplyObjectModifyMasks(task.OwnerMask, objflags); | 310 | uint objectOwnerMask = ApplyObjectModifyMasks(task.OwnerMask, objflags); |
310 | objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; | 311 | objectOwnerMask |= (uint)LLObject.ObjectFlags.ObjectYouOwner | (uint)LLObject.ObjectFlags.ObjectAnyOwner | (uint)LLObject.ObjectFlags.ObjectOwnerModify; |
311 | 312 | ||
312 | // Customize the GroupMask | 313 | // Customize the GroupMask |
313 | // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); | 314 | // uint objectGroupMask = ApplyObjectModifyMasks(task.GroupMask, objflags); |