diff options
author | McCabe Maxsted | 2009-10-02 22:18:02 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-10-02 22:18:02 -0700 |
commit | 153e86b038796e5f449bd084f432a18e12725c6b (patch) | |
tree | a072f506db48b1c2f2dd830c10f05f817d904b5b | |
parent | Added mini-map partner dot color for future use (currently unused) (diff) | |
download | meta-impy-153e86b038796e5f449bd084f432a18e12725c6b.zip meta-impy-153e86b038796e5f449bd084f432a18e12725c6b.tar.gz meta-impy-153e86b038796e5f449bd084f432a18e12725c6b.tar.bz2 meta-impy-153e86b038796e5f449bd084f432a18e12725c6b.tar.xz |
Applied clickable object names for whisper/say/shout from Emerald viewer
-rw-r--r-- | ChangeLog.txt | 7 | ||||
-rw-r--r-- | linden/indra/newview/llviewermessage.cpp | 26 |
2 files changed, 33 insertions, 0 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt index 4b03d56..5eadab7 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt | |||
@@ -1,3 +1,10 @@ | |||
1 | 2009-10-02 McCabe Maxsted <hakushakukun@gmail.com> | ||
2 | |||
3 | * Applied clickable object names for whisper/say/shout from Emerald viewer. | ||
4 | |||
5 | modified: linden/indra/newview/llviewermessage.cpp | ||
6 | |||
7 | |||
1 | 2009-10-01 McCabe Maxsted <hakushakukun@gmail.com> | 8 | 2009-10-01 McCabe Maxsted <hakushakukun@gmail.com> |
2 | 9 | ||
3 | * Added mini-map partner dot color for future use (currently unused). | 10 | * Added mini-map partner dot color for future use (currently unused). |
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index d900cd9..47231fb 100644 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp | |||
@@ -2436,6 +2436,32 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) | |||
2436 | is_owned_by_me = chatter->permYouOwner(); | 2436 | is_owned_by_me = chatter->permYouOwner(); |
2437 | } | 2437 | } |
2438 | 2438 | ||
2439 | if(chat.mSourceType == CHAT_SOURCE_OBJECT | ||
2440 | && chat.mChatType != CHAT_TYPE_DEBUG_MSG | ||
2441 | && !owner_id.isNull() | ||
2442 | && owner_id != gAgent.getID()) | ||
2443 | { | ||
2444 | std::string tempname = from_name; | ||
2445 | |||
2446 | size_t found = tempname.find(" "); | ||
2447 | while(found != std::string::npos) | ||
2448 | { | ||
2449 | tempname.replace(found, 1, ""); | ||
2450 | found = tempname.find(" "); | ||
2451 | } | ||
2452 | |||
2453 | if (tempname.length() < 1) | ||
2454 | { | ||
2455 | from_name = "no name"; | ||
2456 | chat.mFromName = from_name; | ||
2457 | } | ||
2458 | |||
2459 | // std::string ownername; | ||
2460 | // if(gCacheName->getFullName(owner_id,ownername)) | ||
2461 | // from_name += (" (" + ownername + ")"); | ||
2462 | chat.mURL = llformat("secondlife:///app/agent/%s/about",owner_id.asString().c_str()); | ||
2463 | } | ||
2464 | |||
2439 | if (is_audible) | 2465 | if (is_audible) |
2440 | { | 2466 | { |
2441 | BOOL visible_in_chat_bubble = FALSE; | 2467 | BOOL visible_in_chat_bubble = FALSE; |