diff options
| author | Diva Canto | 2010-01-10 15:35:15 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-01-10 15:35:15 -0800 |
| commit | c0642bf7e06924397894229677235e2a841768bc (patch) | |
| tree | 3d052597318fd29e107662ab29bb831ff8380582 /OpenSim/Region/Framework | |
| parent | * Changed IPresenceService Logout, so that it takes a position and a lookat (diff) | |
| parent | Remove all references to master avatar, replacing with estate owner where (diff) | |
| download | opensim-SC-c0642bf7e06924397894229677235e2a841768bc.zip opensim-SC-c0642bf7e06924397894229677235e2a841768bc.tar.gz opensim-SC-c0642bf7e06924397894229677235e2a841768bc.tar.bz2 opensim-SC-c0642bf7e06924397894229677235e2a841768bc.tar.xz | |
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
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 |