From 3261332e0bf3eceddc022e56fdda3ee2d6fc8174 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Thu, 26 Jan 2012 02:30:42 +0100 Subject: [PATCH 01/39] ouch-i-feel-so-stupid build fix --- indra/llvfs/llpidlock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp index 4057829fb..21cfa66a8 100644 --- a/indra/llvfs/llpidlock.cpp +++ b/indra/llvfs/llpidlock.cpp @@ -56,7 +56,7 @@ static bool isProcessAlive(U32 pid) #else //Everyone Else static U32 getPID() { - return getpid() + return getpid(); } static bool isProcessAlive(U32 pid) From 910cb29a7f83e75db615b17eb34b21babab96dc9 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 25 Jan 2012 20:11:07 -0600 Subject: [PATCH 02/39] Truncating fasttimer times to integers in the hovertext is not very useful.. --- indra/llcommon/llfasttimer_class.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index 20f64d1a1..2d1297344 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -307,11 +307,11 @@ std::string LLFastTimer::NamedTimer::getToolTip(S32 history_idx) if (history_idx < 0) { // by default, show average number of call - return llformat("%s (%d ms, %d calls)", getName().c_str(), (S32)(getCountAverage() * ms_multiplier), (S32)getCallAverage()); + return llformat("%s (%.2f ms, %d calls)", getName().c_str(), (F32)((F32)getCountAverage() * ms_multiplier), (S32)getCallAverage()); } else { - return llformat("%s (%d ms, %d calls)", getName().c_str(), (S32)(getHistoricalCount(history_idx) * ms_multiplier), (S32)getHistoricalCalls(history_idx)); + return llformat("%s (%.2f ms, %d calls)", getName().c_str(), (F32)((F32)getHistoricalCount(history_idx) * ms_multiplier), (S32)getHistoricalCalls(history_idx)); } } From 2b8a5b4bd1db4701a35d9709c5cb3a375cc2712e Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 25 Jan 2012 20:11:42 -0600 Subject: [PATCH 03/39] Allow tooltip to be refreshed when hovering over fasttimer bars. --- indra/newview/llfasttimerview.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/llfasttimerview.cpp b/indra/newview/llfasttimerview.cpp index 47a490ecc..42a14b7f6 100644 --- a/indra/newview/llfasttimerview.cpp +++ b/indra/newview/llfasttimerview.cpp @@ -288,6 +288,7 @@ BOOL LLFastTimerView::handleHover(S32 x, S32 y, MASK mask) // covering region for this new timer, go ahead and unblock // so we can create a new tooltip //LLToolTipMgr::instance().unblockToolTips(); + gViewerWindow->unblockToolTips(); mHoverTimer = (*it); } From 29cdfdc13e89af70bb80c90229ad39a54417a75f Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 25 Jan 2012 20:12:26 -0600 Subject: [PATCH 04/39] Crashfix in LLAgent::teleportViaLocation if called before avatar is loaded (ex: doubleclicking the minimap) --- indra/newview/llagent.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index e36cc20bb..b6ac5613c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -3561,6 +3561,8 @@ void LLAgent::teleportCancel() void LLAgent::teleportViaLocation(const LLVector3d& pos_global) { + if(!isAgentAvatarValid()) + return; // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2010-03-02 (RLVa-1.1.1a) | Modified: RLVa-1.2.0a if (rlv_handler_t::isEnabled()) { From cef03d52cb30e64510541519a9c2a2ad78603d80 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 25 Jan 2012 20:14:38 -0600 Subject: [PATCH 05/39] Un-inline LLFastTimer::NamedTimer::getCountAverage and LLFastTimer::NamedTimer::getCallAverage so some experimenting can be done in llfasttimer_class.cpp without massive recompiles. --- indra/llcommon/llfasttimer_class.cpp | 9 +++++++++ indra/llcommon/llfasttimer_class.h | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/llfasttimer_class.cpp b/indra/llcommon/llfasttimer_class.cpp index 2d1297344..e672099fc 100644 --- a/indra/llcommon/llfasttimer_class.cpp +++ b/indra/llcommon/llfasttimer_class.cpp @@ -498,6 +498,15 @@ void LLFastTimer::NamedTimer::accumulateTimings() } } +U32 LLFastTimer::NamedTimer::getCountAverage() const +{ + return mCountAverage;// (sCurFrameIndex <= 0 || mCountAverage <= 0) ? 0 : mCountAverage / llmin(sCurFrameIndex,(S32)HISTORY_NUM); +} +U32 LLFastTimer::NamedTimer::getCallAverage() const +{ + return mCallAverage;// (sCurFrameIndex <= 0 || mCallAverage <= 0) ? 0 : mCallAverage / llmin(sCurFrameIndex,(S32)HISTORY_NUM); +} + // static void LLFastTimer::NamedTimer::resetFrame() { diff --git a/indra/llcommon/llfasttimer_class.h b/indra/llcommon/llfasttimer_class.h index 9e7fdaec6..536de6c0d 100644 --- a/indra/llcommon/llfasttimer_class.h +++ b/indra/llcommon/llfasttimer_class.h @@ -82,8 +82,8 @@ public: void setCollapsed(bool collapsed) { mCollapsed = collapsed; } bool getCollapsed() const { return mCollapsed; } - U32 getCountAverage() const { return mCountAverage; } - U32 getCallAverage() const { return mCallAverage; } + U32 getCountAverage() const; //{ return mCountAverage } + U32 getCallAverage() const; //{ return mCallAverage } U32 getHistoricalCount(S32 history_index = 0) const; U32 getHistoricalCalls(S32 history_index = 0) const; From da96043a24c10fc063bcc9d39fa79d4942f6d8a4 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Thu, 26 Jan 2012 05:43:09 -0500 Subject: [PATCH 06/39] Chopped off a ton of the old stuff, and added value fields... These don't seem to work right, however, no matter, the value fields help make more precise changes. The existence of these were brought up to me by a phoenix user, not sure why showing them was set false. --- .../xui/en-us/panel_preferences_input.xml | 98 ++++--------------- 1 file changed, 17 insertions(+), 81 deletions(-) diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml index eeb498902..c5ed1c4b4 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_input.xml @@ -1,83 +1,19 @@ - - - Mouselook Options: - - - Mouse Sensitivity: - - - - - - Auto Fly Options: - - - - Camera Options: - - - Camera View Angle: - - - - Camera Follow Distance: - - - - - -