diff options
| author | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
|---|---|---|
| committer | Aaron Brashears <aaronb@lindenlab.com> | 2007-02-09 23:35:12 +0000 |
| commit | 5cc44523f79b6cf495d2649fce9bf9e5181787e8 (patch) | |
| tree | af7409521b24318b7c48a7434824178888c17a3e /indra/newview/llviewermenu.cpp | |
| parent | 0009346667872b90d39089c3800ab3e00ce73b51 (diff) | |
Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release.
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 49578b186d..838bf68f3d 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2124,7 +2124,7 @@ class LLAvatarDebug : public view_listener_t } llinfos << "Dumping temporary asset data to simulator logs for avatar " << avatar->getID() << llendl; std::vector<std::string> strings; - strings.push_back( avatar->getID().getString() ); + strings.push_back(avatar->getID().asString()); LLUUID invoice; send_generic_message("dumptempassetdata", strings, invoice); LLFloaterAvatarTextures::show( avatar->getID() ); @@ -7431,7 +7431,7 @@ void handle_selected_texture_info(void*) std::string image_id_string; if (gAgent.isGodlike()) { - image_id_string = image_id.getString() + " "; + image_id_string = image_id.asString() + " "; } msg = llformat("%s%dx%d %s on face ", image_id_string.c_str(), @@ -8246,7 +8246,9 @@ BOOL LLViewerMenuHolderGL::hideMenus() if (handled) { gSelectMgr->deselectTransient(); - if (!gFloaterTools->getVisible() && !LLFloaterLand::floaterVisible()) + if(!gFloaterTools->getVisible() + && !LLFloaterLand::floaterVisible() + && !LLFloaterBuyLand::isOpen()) { gParcelMgr->deselectLand(); } |