diff options
author | Melanie | 2010-01-10 22:41:42 +0000 |
---|---|---|
committer | Melanie | 2010-01-10 22:41:42 +0000 |
commit | 3c90d834eac382af5edf091e83aea1ffcce91792 (patch) | |
tree | 60662b0f13fab4e0d7a7ab93533e5e66edbecf68 /OpenSim/Region/Framework | |
parent | * Last reference to CommsManager.UserProfileCacheService removed (diff) | |
download | opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.zip opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.gz opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.bz2 opensim-SC-3c90d834eac382af5edf091e83aea1ffcce91792.tar.xz |
Remove all references to master avatar, replacing with estate owner where
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 476873a..e0da51b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -101,12 +101,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
101 | { | 101 | { |
102 | userlevel = 1; | 102 | userlevel = 1; |
103 | } | 103 | } |
104 | // TODO: remove this cruft once MasterAvatar is fully deprecated | ||
105 | // | ||
106 | if (m_regInfo.MasterAvatarAssignedUUID == AgentID) | ||
107 | { | ||
108 | userlevel = 2; | ||
109 | } | ||
110 | EventManager.TriggerOnNewInventoryItemUploadComplete(AgentID, item.AssetID, item.Name, userlevel); | 104 | EventManager.TriggerOnNewInventoryItemUploadComplete(AgentID, item.AssetID, item.Name, userlevel); |
111 | } | 105 | } |
112 | else | 106 | else |