diff options
| author | callum <none@none> | 2010-06-17 15:17:34 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-06-17 15:17:34 -0700 |
| commit | 2a60e057de637536b775153d619c3da202b0f8e5 (patch) | |
| tree | 8cd00307e883f9b476a88ba82aee3043cff26446 | |
| parent | 107aee0c6eb17d6433de60e35d33dc4779a6a9e3 (diff) | |
| parent | 8d84b6e82d17eb11622b3d80254ccc4ac15c5bec (diff) | |
Merge with tip
| -rw-r--r-- | indra/newview/llavatariconctrl.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llavatariconctrl.cpp b/indra/newview/llavatariconctrl.cpp index 87b8d807c4..abb79b53a7 100644 --- a/indra/newview/llavatariconctrl.cpp +++ b/indra/newview/llavatariconctrl.cpp @@ -244,7 +244,10 @@ void LLAvatarIconCtrl::setValue(const LLSD& value) LLIconCtrl::setValue(value); } - gCacheName->get(mAvatarId, FALSE, boost::bind(&LLAvatarIconCtrl::nameUpdatedCallback, this, _1, _2, _3, _4)); + if (gCacheName) + { + gCacheName->get(mAvatarId, FALSE, boost::bind(&LLAvatarIconCtrl::nameUpdatedCallback, this, _1, _2, _3, _4)); + } } bool LLAvatarIconCtrl::updateFromCache() diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index df5be34e39..3ef190f766 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1116,8 +1116,6 @@ bool idle_startup() LLVoiceClient::getInstance()->userAuthorized(gUserCredential->userID(), gAgentID); // create the default proximal channel LLVoiceChannel::initClass(); - // update the voice settings - LLVoiceClient::getInstance()->updateSettings(); LLGridManager::getInstance()->setFavorite(); LLStartUp::setStartupState( STATE_WORLD_INIT); } @@ -1300,6 +1298,10 @@ bool idle_startup() LLAppViewer::instance()->loadNameCache(); } + // update the voice settings *after* gCacheName initialization + // so that we can construct voice UI that relies on the name cache + LLVoiceClient::getInstance()->updateSettings(); + //gCacheName is required for nearby chat history loading //so I just moved nearby history loading a few states further if (!gNoRender && gSavedPerAccountSettings.getBOOL("LogShowHistory")) |