diff options
author | McCabe Maxsted | 2010-11-01 21:39:24 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-11-01 21:39:24 -0700 |
commit | 0c4a202692432b32bb8f8157b8b51085bd56a21c (patch) | |
tree | 38b5390ce3a20b9ca1adb2cf8681ab48ed34cb7a /linden/indra | |
parent | Fixed crash when logging into an Aurora sim without the region/estate window ... (diff) | |
download | meta-impy-0c4a202692432b32bb8f8157b8b51085bd56a21c.zip meta-impy-0c4a202692432b32bb8f8157b8b51085bd56a21c.tar.gz meta-impy-0c4a202692432b32bb8f8157b8b51085bd56a21c.tar.bz2 meta-impy-0c4a202692432b32bb8f8157b8b51085bd56a21c.tar.xz |
Use the right name for the Aurora capability
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llfloaterregioninfo.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/llviewerregion.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp index 76e6b01..9e6f323 100644 --- a/linden/indra/newview/llfloaterregioninfo.cpp +++ b/linden/indra/newview/llfloaterregioninfo.cpp | |||
@@ -183,7 +183,7 @@ BOOL LLFloaterRegionInfo::postBuild() | |||
183 | mTab->addTabPanel(panel, panel->getLabel(), TRUE); | 183 | mTab->addTabPanel(panel, panel->getLabel(), TRUE); |
184 | 184 | ||
185 | // We only use this panel on Aurora-based sims -- MC | 185 | // We only use this panel on Aurora-based sims -- MC |
186 | std::string url = gAgent.getRegion()->getCapability("OpenRegionSettings"); | 186 | std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings"); |
187 | if (!url.empty()) | 187 | if (!url.empty()) |
188 | { | 188 | { |
189 | panel = new LLPanelRegionOpenSettingsInfo; | 189 | panel = new LLPanelRegionOpenSettingsInfo; |
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index cf2e3a4..e62bd3c 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp | |||
@@ -1422,6 +1422,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) | |||
1422 | LLSD capabilityNames = LLSD::emptyArray(); | 1422 | LLSD capabilityNames = LLSD::emptyArray(); |
1423 | capabilityNames.append("ChatSessionRequest"); | 1423 | capabilityNames.append("ChatSessionRequest"); |
1424 | capabilityNames.append("CopyInventoryFromNotecard"); | 1424 | capabilityNames.append("CopyInventoryFromNotecard"); |
1425 | // Aurora settings -- MC | ||
1425 | capabilityNames.append("DispatchOpenRegionSettings"); | 1426 | capabilityNames.append("DispatchOpenRegionSettings"); |
1426 | capabilityNames.append("DispatchRegionInfo"); | 1427 | capabilityNames.append("DispatchRegionInfo"); |
1427 | capabilityNames.append("DispatchWindLightSettings"); | 1428 | capabilityNames.append("DispatchWindLightSettings"); |
@@ -1436,8 +1437,6 @@ void LLViewerRegion::setSeedCapability(const std::string& url) | |||
1436 | capabilityNames.append("MapLayer"); | 1437 | capabilityNames.append("MapLayer"); |
1437 | capabilityNames.append("MapLayerGod"); | 1438 | capabilityNames.append("MapLayerGod"); |
1438 | capabilityNames.append("NewFileAgentInventory"); | 1439 | capabilityNames.append("NewFileAgentInventory"); |
1439 | // Aurora settings -- MC | ||
1440 | capabilityNames.append("OpenRegionSettings"); | ||
1441 | capabilityNames.append("ParcelPropertiesUpdate"); | 1440 | capabilityNames.append("ParcelPropertiesUpdate"); |
1442 | capabilityNames.append("ParcelVoiceInfoRequest"); | 1441 | capabilityNames.append("ParcelVoiceInfoRequest"); |
1443 | capabilityNames.append("ProductInfoRequest"); | 1442 | capabilityNames.append("ProductInfoRequest"); |