diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index 54542c9..d07f66e 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |||
@@ -157,11 +157,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
157 | m_features["MeshXferEnabled"] = true; | 157 | m_features["MeshXferEnabled"] = true; |
158 | 158 | ||
159 | m_features["PhysicsMaterialsEnabled"] = true; | 159 | m_features["PhysicsMaterialsEnabled"] = true; |
160 | <<<<<<< HEAD | ||
161 | 160 | ||
162 | ======= | ||
163 | |||
164 | >>>>>>> avn/ubitvar | ||
165 | OSDMap typesMap = new OSDMap(); | 161 | OSDMap typesMap = new OSDMap(); |
166 | typesMap["convex"] = true; | 162 | typesMap["convex"] = true; |
167 | typesMap["none"] = true; | 163 | typesMap["none"] = true; |
@@ -169,7 +165,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
169 | m_features["PhysicsShapeTypes"] = typesMap; | 165 | m_features["PhysicsShapeTypes"] = typesMap; |
170 | 166 | ||
171 | // Extra information for viewers that want to use it | 167 | // Extra information for viewers that want to use it |
172 | <<<<<<< HEAD | ||
173 | // TODO: Take these out of here into their respective modules, like map-server-url | 168 | // TODO: Take these out of here into their respective modules, like map-server-url |
174 | OSDMap extrasMap; | 169 | OSDMap extrasMap; |
175 | if(m_features.ContainsKey("OpenSimExtras")) | 170 | if(m_features.ContainsKey("OpenSimExtras")) |
@@ -179,15 +174,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
179 | else | 174 | else |
180 | extrasMap = new OSDMap(); | 175 | extrasMap = new OSDMap(); |
181 | 176 | ||
182 | ======= | ||
183 | |||
184 | OSDMap extrasMap = new OSDMap(); | ||
185 | |||
186 | extrasMap["AvatarSkeleton"] = true; | 177 | extrasMap["AvatarSkeleton"] = true; |
187 | extrasMap["AnimationSet"] = true; | 178 | extrasMap["AnimationSet"] = true; |
188 | 179 | ||
189 | // TODO: Take these out of here into their respective modules, like map-server-url | 180 | // TODO: Take these out of here into their respective modules, like map-server-url |
190 | >>>>>>> avn/ubitvar | ||
191 | if (m_SearchURL != string.Empty) | 181 | if (m_SearchURL != string.Empty) |
192 | extrasMap["search-server-url"] = m_SearchURL; | 182 | extrasMap["search-server-url"] = m_SearchURL; |
193 | if (!string.IsNullOrEmpty(m_DestinationGuideURL)) | 183 | if (!string.IsNullOrEmpty(m_DestinationGuideURL)) |
@@ -199,13 +189,8 @@ namespace OpenSim.Region.ClientStack.Linden | |||
199 | if (m_GridName != string.Empty) | 189 | if (m_GridName != string.Empty) |
200 | extrasMap["GridName"] = m_GridName; | 190 | extrasMap["GridName"] = m_GridName; |
201 | 191 | ||
202 | <<<<<<< HEAD | ||
203 | if (extrasMap.Count > 0) | 192 | if (extrasMap.Count > 0) |
204 | m_features["OpenSimExtras"] = extrasMap; | 193 | m_features["OpenSimExtras"] = extrasMap; |
205 | ======= | ||
206 | m_features["OpenSimExtras"] = extrasMap; | ||
207 | |||
208 | >>>>>>> avn/ubitvar | ||
209 | } | 194 | } |
210 | } | 195 | } |
211 | 196 | ||