aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2013-04-25 01:37:18 +0200
committerMelanie2013-04-25 01:37:18 +0200
commit51e05dcb5be80bc93061443072fd5587f83052e6 (patch)
tree4b9d1ca659a2dda8170cb450106b46f23cec2a63
parentAdd the enter uuid dialog (diff)
downloadopensim-SC_OLD-51e05dcb5be80bc93061443072fd5587f83052e6.zip
opensim-SC_OLD-51e05dcb5be80bc93061443072fd5587f83052e6.tar.gz
opensim-SC_OLD-51e05dcb5be80bc93061443072fd5587f83052e6.tar.bz2
opensim-SC_OLD-51e05dcb5be80bc93061443072fd5587f83052e6.tar.xz
Gods module cleanup
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs10
1 files changed, 0 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 9fa9be1..d2e71a7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -67,9 +67,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
67 protected Scene m_scene; 67 protected Scene m_scene;
68 protected IDialogModule m_dialogModule; 68 protected IDialogModule m_dialogModule;
69 69
70 protected Dictionary<UUID, string> m_capsDict =
71 new Dictionary<UUID, string>();
72
73 protected IDialogModule DialogModule 70 protected IDialogModule DialogModule
74 { 71 {
75 get 72 get
@@ -91,7 +88,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
91 m_scene.RegisterModuleInterface<IGodsModule>(this); 88 m_scene.RegisterModuleInterface<IGodsModule>(this);
92 m_scene.EventManager.OnNewClient += SubscribeToClientEvents; 89 m_scene.EventManager.OnNewClient += SubscribeToClientEvents;
93 m_scene.EventManager.OnRegisterCaps += OnRegisterCaps; 90 m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
94 m_scene.EventManager.OnClientClosed += OnClientClosed;
95 scene.EventManager.OnIncomingInstantMessage += 91 scene.EventManager.OnIncomingInstantMessage +=
96 OnIncomingInstantMessage; 92 OnIncomingInstantMessage;
97 } 93 }
@@ -127,15 +123,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
127 client.OnRequestGodlikePowers -= RequestGodlikePowers; 123 client.OnRequestGodlikePowers -= RequestGodlikePowers;
128 } 124 }
129 125
130 private void OnClientClosed(UUID agentID, Scene scene)
131 {
132 m_capsDict.Remove(agentID);
133 }
134
135 private void OnRegisterCaps(UUID agentID, Caps caps) 126 private void OnRegisterCaps(UUID agentID, Caps caps)
136 { 127 {
137 string uri = "/CAPS/" + UUID.Random(); 128 string uri = "/CAPS/" + UUID.Random();
138 m_capsDict[agentID] = uri;
139 129
140 caps.RegisterHandler("UntrustedSimulatorMessage", 130 caps.RegisterHandler("UntrustedSimulatorMessage",
141 new RestStreamHandler("POST", uri, 131 new RestStreamHandler("POST", uri,