diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-08-21 22:17:53 +0000 |
| commit | ce0a5fe14590b8d675b885fccd5f79d7ea17a302 (patch) | |
| tree | 3388e6f8ff02292ec4521d278c841801462945b8 /indra/newview/llviewerregion.cpp | |
| parent | b699ae454d8477d19342d320758cd993d1d28cec (diff) | |
EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/maintenance into release
Actual action: branched maintenance-r68118, merged in release, then copied result into release
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index c3841cdd98..81af21069e 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1187,9 +1187,9 @@ public: llinfos << "BaseCapabilitiesComplete::error " << statusNum << ": " << reason << llendl; - if (STATE_SEED_GRANTED_WAIT == gStartupState) + if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState()) { - gStartupState = STATE_SEED_CAP_GRANTED; + LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED ); } } @@ -1203,9 +1203,9 @@ public: << iter->first << llendl; } - if (STATE_SEED_GRANTED_WAIT == gStartupState) + if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState()) { - gStartupState = STATE_SEED_CAP_GRANTED; + LLStartUp::setStartupState( STATE_SEED_CAP_GRANTED ); } } @@ -1256,6 +1256,7 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("ChatSessionRequest"); capabilityNames.append("ProvisionVoiceAccountRequest"); capabilityNames.append("ServerReleaseNotes"); + capabilityNames.append("CopyInventoryFromNotecard"); llinfos << "posting to seed " << url << llendl; |