diff options
author | UbitUmarov | 2019-01-01 12:06:29 +0000 |
---|---|---|
committer | UbitUmarov | 2019-01-01 12:06:29 +0000 |
commit | 02492f7b15f29419c1ea4725a6ae6959bc199912 (patch) | |
tree | 2967fed8eba4d3b801a763ddeb50804226c446cb /OpenSim/Capabilities/Caps.cs | |
parent | temporary HACK to not kill some viewers (diff) | |
download | opensim-SC-02492f7b15f29419c1ea4725a6ae6959bc199912.zip opensim-SC-02492f7b15f29419c1ea4725a6ae6959bc199912.tar.gz opensim-SC-02492f7b15f29419c1ea4725a6ae6959bc199912.tar.bz2 opensim-SC-02492f7b15f29419c1ea4725a6ae6959bc199912.tar.xz |
replace my hack by others hack
Diffstat (limited to 'OpenSim/Capabilities/Caps.cs')
-rw-r--r-- | OpenSim/Capabilities/Caps.cs | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Caps.cs b/OpenSim/Capabilities/Caps.cs index 82ecd55..9931934 100644 --- a/OpenSim/Capabilities/Caps.cs +++ b/OpenSim/Capabilities/Caps.cs | |||
@@ -119,6 +119,17 @@ namespace OpenSim.Framework.Capabilities | |||
119 | get { return m_externalCapsHandlers; } | 119 | get { return m_externalCapsHandlers; } |
120 | } | 120 | } |
121 | 121 | ||
122 | [Flags] | ||
123 | public enum CapsFlags:uint | ||
124 | { | ||
125 | None = 0, | ||
126 | SentSeeds = 1, | ||
127 | |||
128 | ObjectAnim = 0x10 | ||
129 | } | ||
130 | |||
131 | public CapsFlags Flags { get; set;} | ||
132 | |||
122 | public Caps(IHttpServer httpServer, string httpListen, uint httpPort, string capsPath, | 133 | public Caps(IHttpServer httpServer, string httpListen, uint httpPort, string capsPath, |
123 | UUID agent, string regionName) | 134 | UUID agent, string regionName) |
124 | { | 135 | { |
@@ -138,12 +149,18 @@ namespace OpenSim.Framework.Capabilities | |||
138 | m_agentID = agent; | 149 | m_agentID = agent; |
139 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort); | 150 | m_capsHandlers = new CapsHandlers(httpServer, httpListen, httpPort); |
140 | m_regionName = regionName; | 151 | m_regionName = regionName; |
152 | Flags = CapsFlags.None; | ||
141 | m_capsActive.Reset(); | 153 | m_capsActive.Reset(); |
142 | } | 154 | } |
143 | 155 | ||
144 | ~Caps() | 156 | ~Caps() |
145 | { | 157 | { |
146 | m_capsActive.Dispose(); | 158 | Flags = CapsFlags.None; |
159 | if (m_capsActive!= null) | ||
160 | { | ||
161 | m_capsActive.Dispose(); | ||
162 | m_capsActive = null; | ||
163 | } | ||
147 | } | 164 | } |
148 | 165 | ||
149 | /// <summary> | 166 | /// <summary> |
@@ -262,6 +279,7 @@ namespace OpenSim.Framework.Capabilities | |||
262 | caps[kvp.Key] = kvp.Value; | 279 | caps[kvp.Key] = kvp.Value; |
263 | } | 280 | } |
264 | 281 | ||
282 | Flags |= CapsFlags.SentSeeds; | ||
265 | return caps; | 283 | return caps; |
266 | } | 284 | } |
267 | 285 | ||