diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-08-19 14:27:23 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-08-19 14:27:23 -0700 |
| commit | eaf235978232d4ec69d95af562d7f5f52a2c09e7 (patch) | |
| tree | 80ff4a0bddc5cfb1648d739a8fcdcb005983cb99 | |
| parent | 83253d12f1ccfdeb53141b09700ae4849c804003 (diff) | |
fixed line endings
| -rw-r--r-- | indra/newview/lltoolpie.cpp | 16 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index 479993c4dd..8ae1861abc 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -880,14 +880,14 @@ BOOL LLToolPie::handleTooltipObject( LLViewerObject* hover_object, std::string l } } - LLAvatarName av_name;
- if (LLAvatarNameCache::get(hover_object->getID(), &av_name))
- {
- final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")";
- }
- else
- {
- final_name = full_name;
+ LLAvatarName av_name; + if (LLAvatarNameCache::get(hover_object->getID(), &av_name)) + { + final_name = av_name.mDisplayName + " (" + av_name.mUsername + ")"; + } + else + { + final_name = full_name; } // *HACK: We may select this object, so pretend it was clicked diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 5c36792a0d..116c9656ae 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -3078,14 +3078,14 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) // I don't know if it's OK to change this here, if // anything downstream does lookups by name, for instance - LLAvatarName av_name;
- if (LLAvatarNameCache::get(from_id, &av_name))
- {
- chat.mFromName = av_name.mDisplayName;
- }
- else
- {
- chat.mFromName = LLCacheName::cleanFullName(from_name);
+ LLAvatarName av_name; + if (LLAvatarNameCache::get(from_id, &av_name)) + { + chat.mFromName = av_name.mDisplayName; + } + else + { + chat.mFromName = LLCacheName::cleanFullName(from_name); } } else |