diff options
| author | McCabe Maxsted | 2010-10-02 01:06:02 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-10-02 01:06:02 -0700 |
| commit | 36026cbabe0ac3ee08ba0fc0f38849feb4a3d2df (patch) | |
| tree | d6424f6418b98d7b3ba6cac12d5b8ea92dd823c4 | |
| parent | RED-581: SNOW-796: Clicking 'Reset to default' in the Debug Settings floater ... (diff) | |
| parent | Merge branch 'weekly' of git://github.com/mccabe/imprudence into weekly (diff) | |
| download | meta-impy-36026cbabe0ac3ee08ba0fc0f38849feb4a3d2df.zip meta-impy-36026cbabe0ac3ee08ba0fc0f38849feb4a3d2df.tar.gz meta-impy-36026cbabe0ac3ee08ba0fc0f38849feb4a3d2df.tar.bz2 meta-impy-36026cbabe0ac3ee08ba0fc0f38849feb4a3d2df.tar.xz | |
Merge remote branch 'elektra/weekly' into weekly
| -rw-r--r-- | linden/indra/newview/llimview.cpp | 16 | ||||
| -rw-r--r-- | linden/indra/newview/llpreviewlandmark.cpp | 4 | ||||
| -rwxr-xr-x | linden/indra/newview/llviewermessage.cpp | 3 |
3 files changed, 10 insertions, 13 deletions
diff --git a/linden/indra/newview/llimview.cpp b/linden/indra/newview/llimview.cpp index 12a26f9..a6eaeb3 100644 --- a/linden/indra/newview/llimview.cpp +++ b/linden/indra/newview/llimview.cpp | |||
| @@ -548,19 +548,13 @@ LLColor4 get_extended_text_color(const LLUUID session_id, const LLUUID other_par | |||
| 548 | { | 548 | { |
| 549 | if (gSavedSettings.getBOOL("HighlightOwnNameInIM") && (other_partecipant_id != LLUUID::null)) | 549 | if (gSavedSettings.getBOOL("HighlightOwnNameInIM") && (other_partecipant_id != LLUUID::null)) |
| 550 | { | 550 | { |
| 551 | LLDynamicArray<LLGroupData>::iterator i; | 551 | if (LLFloaterChat::isOwnNameInText(msg)) |
| 552 | for (i = gAgent.mGroups.begin(); i != gAgent.mGroups.end(); i++) | 552 | return gSavedSettings.getColor4("OwnNameChatColor"); |
| 553 | { | ||
| 554 | if (i->mID == session_id) | ||
| 555 | { | ||
| 556 | if (LLFloaterChat::isOwnNameInText(msg)) | ||
| 557 | return gSavedSettings.getColor4("OwnNameChatColor"); | ||
| 558 | else | ||
| 559 | break; | ||
| 560 | } | ||
| 561 | } | ||
| 562 | } | 553 | } |
| 563 | 554 | ||
| 555 | if (gSavedSettings.getBOOL("HighlightFriendsChat") && is_agent_friend(other_partecipant_id)) | ||
| 556 | return gSavedSettings.getColor4("FriendsChatColor"); | ||
| 557 | |||
| 564 | return defaultColor; | 558 | return defaultColor; |
| 565 | } | 559 | } |
| 566 | 560 | ||
diff --git a/linden/indra/newview/llpreviewlandmark.cpp b/linden/indra/newview/llpreviewlandmark.cpp index 07addad..a8a510f 100644 --- a/linden/indra/newview/llpreviewlandmark.cpp +++ b/linden/indra/newview/llpreviewlandmark.cpp | |||
| @@ -89,10 +89,12 @@ LLPreviewLandmark::LLPreviewLandmark(const std::string& name, | |||
| 89 | inv_item), | 89 | inv_item), |
| 90 | mLandmark( NULL ) | 90 | mLandmark( NULL ) |
| 91 | { | 91 | { |
| 92 | |||
| 93 | mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this); | 92 | mFactoryMap["place_details_panel"] = LLCallbackMap(LLPreviewLandmark::createPlaceDetail, this); |
| 94 | if (show_keep_discard) | 93 | if (show_keep_discard) |
| 95 | { | 94 | { |
| 95 | // Move the notification in llviewermessage in the if/else there please. | ||
| 96 | // This class is no more called if show_keep_discard != TRUE -- Ele | ||
| 97 | |||
| 96 | // Decided against this, a text notification is a better fix for this -- McCabe | 98 | // Decided against this, a text notification is a better fix for this -- McCabe |
| 97 | //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap()); | 99 | //LLUICtrlFactory::getInstance()->buildFloater(this, "floater_preview_new_landmark.xml", &getFactoryMap()); |
| 98 | //childSetAction("Discard btn",onDiscardBtn,this); | 100 | //childSetAction("Discard btn",onDiscardBtn,this); |
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index 6322d27..52113ce 100755 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp | |||
| @@ -922,7 +922,8 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name) | |||
| 922 | } | 922 | } |
| 923 | break; | 923 | break; |
| 924 | case LLAssetType::AT_LANDMARK: | 924 | case LLAssetType::AT_LANDMARK: |
| 925 | open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE); | 925 | if (!show_keep_discard) |
| 926 | open_landmark((LLViewerInventoryItem*)item, std::string("Landmark: ") + item->getName(), FALSE, LLUUID::null, FALSE); | ||
| 926 | break; | 927 | break; |
| 927 | case LLAssetType::AT_TEXTURE: | 928 | case LLAssetType::AT_TEXTURE: |
| 928 | open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE); | 929 | open_texture(*it, std::string("Texture: ") + item->getName(), show_keep_discard, LLUUID::null, FALSE); |