diff options
author | Diva Canto | 2013-07-30 17:26:56 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-30 17:26:56 -0700 |
commit | 2b5419927143667048bddf0a501e42c093a71147 (patch) | |
tree | d1d8dd89060a633794cd791644345943a1edc90a | |
parent | Groups: Better warning messages to the user. (diff) | |
download | opensim-SC_OLD-2b5419927143667048bddf0a501e42c093a71147.zip opensim-SC_OLD-2b5419927143667048bddf0a501e42c093a71147.tar.gz opensim-SC_OLD-2b5419927143667048bddf0a501e42c093a71147.tar.bz2 opensim-SC_OLD-2b5419927143667048bddf0a501e42c093a71147.tar.xz |
After talking to lkalif on the IRC: SimulatorFeatures response: renamed the OSDMap GridServices to OpenSimExtras, normalized the url keys under it, and moved ExportEnabled to under it too. Melanie: change your viewer code accordingly.
Documentation at http://opensimulator.org/wiki/SimulatorFeatures_Extras
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index 7d9f935..4bd17b1 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs | |||
@@ -149,15 +149,16 @@ namespace OpenSim.Region.ClientStack.Linden | |||
149 | m_features["PhysicsShapeTypes"] = typesMap; | 149 | m_features["PhysicsShapeTypes"] = typesMap; |
150 | 150 | ||
151 | // Extra information for viewers that want to use it | 151 | // Extra information for viewers that want to use it |
152 | OSDMap gridServicesMap = new OSDMap(); | 152 | OSDMap extrasMap = new OSDMap(); |
153 | if (m_MapImageServerURL != string.Empty) | 153 | if (m_MapImageServerURL != string.Empty) |
154 | gridServicesMap["map-server-url"] = m_MapImageServerURL; | 154 | extrasMap["map-server-url"] = m_MapImageServerURL; |
155 | if (m_SearchURL != string.Empty) | 155 | if (m_SearchURL != string.Empty) |
156 | gridServicesMap["search"] = m_SearchURL; | 156 | extrasMap["search-server-url"] = m_SearchURL; |
157 | m_features["GridServices"] = gridServicesMap; | ||
158 | |||
159 | if (m_ExportSupported) | 157 | if (m_ExportSupported) |
160 | m_features["ExportSupported"] = true; | 158 | extrasMap["ExportSupported"] = true; |
159 | if (extrasMap.Count > 0) | ||
160 | m_features["OpenSimExtras"] = extrasMap; | ||
161 | |||
161 | } | 162 | } |
162 | } | 163 | } |
163 | 164 | ||