From 5838a959f0524bd3351b1d887162016142d5c855 Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Sun, 22 Mar 2009 12:26:13 -0700 Subject: Removed slviewer-0-v12160-RememberStatsPosAndSize.patch --- linden/indra/newview/app_settings/settings.xml | 16 ---------------- linden/indra/newview/lldebugview.cpp | 8 +++++--- linden/indra/newview/llfloaterstats.cpp | 3 --- 3 files changed, 5 insertions(+), 22 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 1c2b694..7405aad 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -3159,22 +3159,6 @@ 400 - FloaterStatsRect - - Comment - Rectangle for statistics bar - Persist - 1 - Type - Rect - Value - - 0 - 450 - 250 - 50 - - FloaterViewBottom Comment diff --git a/linden/indra/newview/lldebugview.cpp b/linden/indra/newview/lldebugview.cpp index 91f5524..69d724e 100644 --- a/linden/indra/newview/lldebugview.cpp +++ b/linden/indra/newview/lldebugview.cpp @@ -42,7 +42,6 @@ #include "llresmgr.h" #include "imageids.h" #include "llvelocitybar.h" -#include "llviewercontrol.h" #include "llviewerwindow.h" #include "llfloaterstats.h" @@ -101,8 +100,11 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) // // Debug statistics // - LLRect statsrect = gSavedSettings.getRect("FloaterStatsRect"); - mFloaterStatsp = new LLFloaterStats(statsrect); + r.set(rect.getWidth() - 250, + rect.getHeight() - 50, + rect.getWidth(), + rect.getHeight() - 450); + mFloaterStatsp = new LLFloaterStats(r); mFloaterStatsp->setFollowsTop(); mFloaterStatsp->setFollowsRight(); diff --git a/linden/indra/newview/llfloaterstats.cpp b/linden/indra/newview/llfloaterstats.cpp index 17e600e..745cb27 100644 --- a/linden/indra/newview/llfloaterstats.cpp +++ b/linden/indra/newview/llfloaterstats.cpp @@ -38,7 +38,6 @@ #include "llfloater.h" #include "llstatview.h" #include "llscrollcontainer.h" -#include "llviewercontrol.h" const S32 LL_SCROLL_BORDER = 1; @@ -65,8 +64,6 @@ LLFloaterStats::LLFloaterStats(const LLRect& rect) LLFloaterStats::~LLFloaterStats() { - // save position of floater - gSavedSettings.setRect("FloaterStatsRect", getRect()); } void LLFloaterStats::reshape(S32 width, S32 height, BOOL called_from_parent) -- cgit v1.1