diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:39:28 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-22 21:39:28 +0100 |
| commit | 2ed0ef46db21e77547932144c92dbfa4cfec7df2 (patch) | |
| tree | c7fcd7cebdfecfb28e7cf12e19eaf43efa0f3c83 | |
| parent | bf8b1bca7d7c2b84ca0460c4af9341a65dcfb025 (diff) | |
| parent | 101882ad747b4a93236623b20bd367e3b2aa69a9 (diff) | |
merge
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 2267db770c..07d4ac664f 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -174,7 +174,7 @@ public: mRegion->showReleaseNotes(); } } - + if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState()) { LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED ); @@ -1490,7 +1490,6 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("ProvisionVoiceAccountRequest"); capabilityNames.append("RemoteParcelRequest"); capabilityNames.append("RequestTextureDownload"); - capabilityNames.append("SimulatorFeatures"); capabilityNames.append("SearchStatRequest"); capabilityNames.append("SearchStatTracking"); capabilityNames.append("SendPostcard"); |