diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index e258bcb..39f5baf 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |||
@@ -50,12 +50,12 @@ namespace OpenSim.Region.ClientStack.Linden | |||
50 | /// This is required for uploading Mesh. | 50 | /// This is required for uploading Mesh. |
51 | /// Since is accepts an open-ended response, we also send more information | 51 | /// Since is accepts an open-ended response, we also send more information |
52 | /// for viewers that care to interpret it. | 52 | /// for viewers that care to interpret it. |
53 | /// | 53 | /// |
54 | /// NOTE: Part of this code was adapted from the Aurora project, specifically | 54 | /// NOTE: Part of this code was adapted from the Aurora project, specifically |
55 | /// the normal part of the response in the capability handler. | 55 | /// the normal part of the response in the capability handler. |
56 | /// </remarks> | 56 | /// </remarks> |
57 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulatorFeaturesModule")] | 57 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimulatorFeaturesModule")] |
58 | public class SimulatorFeaturesModule : ISharedRegionModule, ISimulatorFeaturesModule | 58 | public class SimulatorFeaturesModule : INonSharedRegionModule, ISimulatorFeaturesModule |
59 | { | 59 | { |
60 | private static readonly ILog m_log = | 60 | private static readonly ILog m_log = |
61 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 61 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
82 | IConfig config = source.Configs["SimulatorFeatures"]; | 82 | IConfig config = source.Configs["SimulatorFeatures"]; |
83 | 83 | ||
84 | if (config != null) | 84 | if (config != null) |
85 | { | 85 | { |
86 | // | 86 | // |
87 | // All this is obsolete since getting these features from the grid service!! | 87 | // All this is obsolete since getting these features from the grid service!! |
88 | // Will be removed after the next release | 88 | // Will be removed after the next release |
@@ -126,10 +126,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
126 | GetGridExtraFeatures(s); | 126 | GetGridExtraFeatures(s); |
127 | } | 127 | } |
128 | 128 | ||
129 | public void PostInitialise() | ||
130 | { | ||
131 | } | ||
132 | |||
133 | public void Close() { } | 129 | public void Close() { } |
134 | 130 | ||
135 | public string Name { get { return "SimulatorFeaturesModule"; } } | 131 | public string Name { get { return "SimulatorFeaturesModule"; } } |
@@ -155,6 +151,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
155 | m_features["MeshRezEnabled"] = true; | 151 | m_features["MeshRezEnabled"] = true; |
156 | m_features["MeshUploadEnabled"] = true; | 152 | m_features["MeshUploadEnabled"] = true; |
157 | m_features["MeshXferEnabled"] = true; | 153 | m_features["MeshXferEnabled"] = true; |
154 | |||
158 | m_features["PhysicsMaterialsEnabled"] = true; | 155 | m_features["PhysicsMaterialsEnabled"] = true; |
159 | 156 | ||
160 | OSDMap typesMap = new OSDMap(); | 157 | OSDMap typesMap = new OSDMap(); |
@@ -173,6 +170,10 @@ namespace OpenSim.Region.ClientStack.Linden | |||
173 | else | 170 | else |
174 | extrasMap = new OSDMap(); | 171 | extrasMap = new OSDMap(); |
175 | 172 | ||
173 | extrasMap["AvatarSkeleton"] = true; | ||
174 | extrasMap["AnimationSet"] = true; | ||
175 | |||
176 | // TODO: Take these out of here into their respective modules, like map-server-url | ||
176 | if (m_SearchURL != string.Empty) | 177 | if (m_SearchURL != string.Empty) |
177 | extrasMap["search-server-url"] = m_SearchURL; | 178 | extrasMap["search-server-url"] = m_SearchURL; |
178 | if (!string.IsNullOrEmpty(m_DestinationGuideURL)) | 179 | if (!string.IsNullOrEmpty(m_DestinationGuideURL)) |
@@ -250,7 +251,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
250 | 251 | ||
251 | //Send back data | 252 | //Send back data |
252 | Hashtable responsedata = new Hashtable(); | 253 | Hashtable responsedata = new Hashtable(); |
253 | responsedata["int_response_code"] = 200; | 254 | responsedata["int_response_code"] = 200; |
254 | responsedata["content_type"] = "text/plain"; | 255 | responsedata["content_type"] = "text/plain"; |
255 | responsedata["keepalive"] = false; | 256 | responsedata["keepalive"] = false; |
256 | 257 | ||