diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 16:12:22 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-19 16:12:22 +0000 |
| commit | ab43ec4cbff4c81c4e9d23b16c716c9347901b6c (patch) | |
| tree | 3dcb5bd93c19b7a921755aa37a066b20ab3b0a07 | |
| parent | 5d6ec09fa18b6d035668c14f53e7341c668b793c (diff) | |
| parent | ae0babf7e962ae90f9789e19e65766d577c22786 (diff) | |
viewer2 merge
| -rw-r--r-- | indra/newview/llfloatersellland.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llpanellogin.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llvoicechannel.cpp | 5 | ||||
| -rw-r--r-- | install.xml | 4 |
5 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp index 9895665026..eae6121e79 100644 --- a/indra/newview/llfloatersellland.cpp +++ b/indra/newview/llfloatersellland.cpp @@ -170,6 +170,7 @@ BOOL LLFloaterSellLandUI::postBuild() childSetAction("sell_btn", doSellLand, this); childSetAction("show_objects", doShowObjects, this); center(); + getChild<LLUICtrl>("profile_scroll")->setTabStop(true); return TRUE; } diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index aefbe9a3de..9de9998cbd 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -204,6 +204,7 @@ void LLHandlerUtil::logGroupNoticeToIMGroup( llwarns << "Group notice for unkown group: " << payload["group_id"].asUUID() << llendl; + return; } const std::string group_name = groupData.mName; diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 43f4024bac..7bd03167fd 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -232,6 +232,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect, if(sim_string.empty()) { LLURLSimString::setString(gSavedSettings.getString("LoginLocation")); + sim_string = LLURLSimString::sInstance.mSimString; } if (!sim_string.empty()) diff --git a/indra/newview/llvoicechannel.cpp b/indra/newview/llvoicechannel.cpp index dfd67d0c38..fac7fa6a18 100644 --- a/indra/newview/llvoicechannel.cpp +++ b/indra/newview/llvoicechannel.cpp @@ -140,7 +140,10 @@ LLVoiceChannel::LLVoiceChannel(const LLUUID& session_id, const std::string& sess LLVoiceChannel::~LLVoiceChannel() { // Don't use LLVoiceClient::getInstance() here -- this can get called during atexit() time and that singleton MAY have already been destroyed. - if(gVoiceClient) + // Using call of instanceExists() instead of gVoiceClient in check to avoid crash in LLVoiceClient::removeObserver() + // when quitting viewer by closing console window before login (though in case of such quit crash will occur + // later in other destructors anyway). EXT-5524 + if(LLVoiceClient::instanceExists()) { gVoiceClient->removeObserver(this); } diff --git a/install.xml b/install.xml index 2e943b2628..eb5bb0f964 100644 --- a/install.xml +++ b/install.xml @@ -502,9 +502,9 @@ <key>linux</key> <map> <key>md5sum</key> - <string>454c3d951d5c20bbf3f0f81cf3c9ecbc</string> + <string>978ad7c67fe4a2419bfc841e2956ff9f</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-2010-02-19-nommap.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.3.9-linux-20090521c.tar.bz2</uri> </map> <key>linux64</key> <map> |