diff options
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index de8925d..498cc2f 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | |||
@@ -120,10 +120,16 @@ namespace OpenSim.Region.CoreModules.Framework | |||
120 | 120 | ||
121 | public void CreateCaps(UUID agentId, uint circuitCode) | 121 | public void CreateCaps(UUID agentId, uint circuitCode) |
122 | { | 122 | { |
123 | // int ts = Util.EnvironmentTickCount(); | ||
124 | /* this as no business here... | ||
125 | * must be done elsewhere ( and is ) | ||
123 | int flags = m_scene.GetUserFlags(agentId); | 126 | int flags = m_scene.GetUserFlags(agentId); |
127 | |||
128 | m_log.ErrorFormat("[CreateCaps]: banCheck {0} ", Util.EnvironmentTickCountSubtract(ts)); | ||
129 | |||
124 | if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags)) | 130 | if (m_scene.RegionInfo.EstateSettings.IsBanned(agentId, flags)) |
125 | return; | 131 | return; |
126 | 132 | */ | |
127 | Caps caps; | 133 | Caps caps; |
128 | String capsObjectPath = GetCapsPath(agentId); | 134 | String capsObjectPath = GetCapsPath(agentId); |
129 | 135 | ||
@@ -132,19 +138,27 @@ namespace OpenSim.Region.CoreModules.Framework | |||
132 | if (m_capsObjects.ContainsKey(circuitCode)) | 138 | if (m_capsObjects.ContainsKey(circuitCode)) |
133 | { | 139 | { |
134 | Caps oldCaps = m_capsObjects[circuitCode]; | 140 | Caps oldCaps = m_capsObjects[circuitCode]; |
135 | 141 | ||
136 | //m_log.WarnFormat( | 142 | // if (capsObjectPath == oldCaps.CapsObjectPath) |
137 | // "[CAPS]: Recreating caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ", | 143 | // { |
138 | // agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); | 144 | // m_log.WarnFormat( |
145 | // "[CAPS]: Reusing caps for agent {0} in region {1}. Old caps path {2}, new caps path {3}. ", | ||
146 | // agentId, m_scene.RegionInfo.RegionName, oldCaps.CapsObjectPath, capsObjectPath); | ||
147 | // return; | ||
148 | // } | ||
139 | } | 149 | } |
140 | 150 | ||
141 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, | 151 | caps = new Caps(MainServer.Instance, m_scene.RegionInfo.ExternalHostName, |
142 | (MainServer.Instance == null) ? 0: MainServer.Instance.Port, | 152 | (MainServer.Instance == null) ? 0: MainServer.Instance.Port, |
143 | capsObjectPath, agentId, m_scene.RegionInfo.RegionName); | 153 | capsObjectPath, agentId, m_scene.RegionInfo.RegionName); |
144 | 154 | ||
155 | // m_log.ErrorFormat("[CreateCaps]: new caps {0} ", Util.EnvironmentTickCountSubtract(ts)); | ||
156 | |||
145 | m_capsObjects[circuitCode] = caps; | 157 | m_capsObjects[circuitCode] = caps; |
146 | } | 158 | } |
147 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); | 159 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); |
160 | // m_log.ErrorFormat("[CreateCaps]: end {0} ", Util.EnvironmentTickCountSubtract(ts)); | ||
161 | |||
148 | } | 162 | } |
149 | 163 | ||
150 | public void RemoveCaps(UUID agentId, uint circuitCode) | 164 | public void RemoveCaps(UUID agentId, uint circuitCode) |