diff options
| author | Melanie | 2013-07-18 10:17:30 +0100 |
|---|---|---|
| committer | Melanie | 2013-07-18 10:17:30 +0100 |
| commit | 437326a4800f23c23abd65b2a44dc21e33f6b1c5 (patch) | |
| tree | 85aee59a2d83ce991064ba663b521d3ef929f1bf /OpenSim/Region/CoreModules/Framework/Caps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.zip opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.gz opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.bz2 opensim-SC_OLD-437326a4800f23c23abd65b2a44dc21e33f6b1c5.tar.xz | |
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/Caps')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs index 3d5ed4f..6ce6227 100644 --- a/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs | |||
| @@ -148,7 +148,6 @@ namespace OpenSim.Region.CoreModules.Framework | |||
| 148 | 148 | ||
| 149 | m_capsObjects[circuitCode] = caps; | 149 | m_capsObjects[circuitCode] = caps; |
| 150 | } | 150 | } |
| 151 | |||
| 152 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); | 151 | m_scene.EventManager.TriggerOnRegisterCaps(agentId, caps); |
| 153 | } | 152 | } |
| 154 | 153 | ||