diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-10-19 12:03:08 -0700 |
| commit | 53b947e0397d6b88fdc6c0a10144e5a6d02a67d3 (patch) | |
| tree | 38c94f216386ba6653e8152d9db0198807f4f2cc /indra/newview/llappviewer.cpp | |
| parent | ed7963bad14abd628fa60d0d5baf357f1858c48c (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
Merge from viewer release.
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 44c9f893b8..68e67a8ac3 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2747,10 +2747,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. @@ -4885,6 +4887,7 @@ void LLAppViewer::idle() gIdleCallbacks.callFunctions(); gInventory.idleNotifyObservers(); + LLAvatarTracker::instance().idleNotifyObservers(); } // Metrics logging (LLViewerAssetStats, etc.) |