diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-13 16:44:20 -0700 |
| commit | 2f6166a5a4f8d5be679cef0699142c4ef061fb55 (patch) | |
| tree | f45efe7e4c55c37dc097f15f8e0f445d86bfe972 /indra/newview/llappviewer.cpp | |
| parent | 8729f5d23a52263e55df5574c672c87d00b563bd (diff) | |
| parent | a16a6034c25c5e78331ef1bd13485df8759456e5 (diff) | |
Pulled merge from llinternal/bento-box.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rwxr-xr-x | indra/newview/llappviewer.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9b9b591cd1..fbf2a04bcc 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2784,10 +2784,12 @@ bool LLAppViewer::initConfiguration() // gWindowTitle = LLTrans::getString("APP_NAME"); #if LL_DEBUG - gWindowTitle += std::string(" [DEBUG] ") + gArgs; -#else - gWindowTitle += std::string(" ") + gArgs; + gWindowTitle += std::string(" [DEBUG]") #endif + if (!gArgs.empty()) + { + gWindowTitle += std::string(" ") + gArgs; + } LLStringUtil::truncate(gWindowTitle, 255); //RN: if we received a URL, hand it off to the existing instance. @@ -4948,6 +4950,7 @@ void LLAppViewer::idle() gIdleCallbacks.callFunctions(); gInventory.idleNotifyObservers(); + LLAvatarTracker::instance().idleNotifyObservers(); } // Metrics logging (LLViewerAssetStats, etc.) |