diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
| commit | 83851db09ab0fecbb6722826055a55844fd98ea6 (patch) | |
| tree | b3c73b1dec463e4d8a8a315f1d713a83e119d99b /indra/newview/llviewermenu.cpp | |
| parent | bdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
merge up to 3.7.25-release
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rwxr-xr-x | indra/newview/llviewermenu.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 79c353f30c..2934864d2a 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -3587,7 +3587,7 @@ class LLSelfSitDown : public view_listener_t bool enable_sitdown_self() { - return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgent.getFlying(); + return isAgentAvatarValid() && !gAgentAvatarp->isSitting() && !gAgentAvatarp->isEditingAppearance() && !gAgent.getFlying(); } class LLCheckPanelPeopleTab : public view_listener_t @@ -7018,10 +7018,6 @@ void handle_selected_texture_info(void*) std::string msg; msg.assign("Texture info for: "); msg.append(node->mName); - - LLSD args; - args["MESSAGE"] = msg; - LLNotificationsUtil::add("SystemMessage", args); U8 te_count = node->getObject()->getNumTEs(); // map from texture ID to list of faces using it @@ -7045,10 +7041,10 @@ void handle_selected_texture_info(void*) S32 height = img->getHeight(); S32 width = img->getWidth(); S32 components = img->getComponents(); - msg = llformat("%dx%d %s on face ", + msg.append(llformat("\n%dx%d %s on face ", width, height, - (components == 4 ? "alpha" : "opaque")); + (components == 4 ? "alpha" : "opaque"))); for (U8 i = 0; i < it->second.size(); ++i) { msg.append( llformat("%d ", (S32)(it->second[i]))); |