aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2013-03-26 19:00:30 +0000
committerMelanie2013-03-26 19:00:30 +0000
commite82fab34d7377a7d9bfc223f093ac67b393677cc (patch)
treeb9f301c93a8a0a8ab41d88a61525fefc362ddedf /OpenSim/Region/ClientStack/Linden
parentPhase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask (diff)
downloadopensim-SC_OLD-e82fab34d7377a7d9bfc223f093ac67b393677cc.zip
opensim-SC_OLD-e82fab34d7377a7d9bfc223f093ac67b393677cc.tar.gz
opensim-SC_OLD-e82fab34d7377a7d9bfc223f093ac67b393677cc.tar.bz2
opensim-SC_OLD-e82fab34d7377a7d9bfc223f093ac67b393677cc.tar.xz
Implement a pref to turn on the simulator ExportSupported feature entry.
This tells the viewer to enable the UI for export permissions. WARNING: If your inventory store contains invalid flags data, this will result in items becoming exportable! Don't turn this on in production until it's complete!
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs6
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 6ef8815..7d9f935 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -70,6 +70,7 @@ namespace OpenSim.Region.ClientStack.Linden
70 70
71 private string m_MapImageServerURL = string.Empty; 71 private string m_MapImageServerURL = string.Empty;
72 private string m_SearchURL = string.Empty; 72 private string m_SearchURL = string.Empty;
73 private bool m_ExportSupported = false;
73 74
74 #region ISharedRegionModule Members 75 #region ISharedRegionModule Members
75 76
@@ -87,6 +88,8 @@ namespace OpenSim.Region.ClientStack.Linden
87 } 88 }
88 89
89 m_SearchURL = config.GetString("SearchServerURI", string.Empty); 90 m_SearchURL = config.GetString("SearchServerURI", string.Empty);
91
92 m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
90 } 93 }
91 94
92 AddDefaultFeatures(); 95 AddDefaultFeatures();
@@ -152,6 +155,9 @@ namespace OpenSim.Region.ClientStack.Linden
152 if (m_SearchURL != string.Empty) 155 if (m_SearchURL != string.Empty)
153 gridServicesMap["search"] = m_SearchURL; 156 gridServicesMap["search"] = m_SearchURL;
154 m_features["GridServices"] = gridServicesMap; 157 m_features["GridServices"] = gridServicesMap;
158
159 if (m_ExportSupported)
160 m_features["ExportSupported"] = true;
155 } 161 }
156 } 162 }
157 163