diff options
Diffstat (limited to 'linden')
-rw-r--r-- | linden/indra/newview/app_settings/settings.xml | 16 | ||||
-rw-r--r-- | linden/indra/newview/lldebugview.cpp | 8 | ||||
-rw-r--r-- | linden/indra/newview/llfloaterstats.cpp | 3 |
3 files changed, 5 insertions, 22 deletions
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 @@ | |||
3159 | <integer>400</integer> | 3159 | <integer>400</integer> |
3160 | </array> | 3160 | </array> |
3161 | </map> | 3161 | </map> |
3162 | <key>FloaterStatsRect</key> | ||
3163 | <map> | ||
3164 | <key>Comment</key> | ||
3165 | <string>Rectangle for statistics bar</string> | ||
3166 | <key>Persist</key> | ||
3167 | <integer>1</integer> | ||
3168 | <key>Type</key> | ||
3169 | <string>Rect</string> | ||
3170 | <key>Value</key> | ||
3171 | <array> | ||
3172 | <integer>0</integer> | ||
3173 | <integer>450</integer> | ||
3174 | <integer>250</integer> | ||
3175 | <integer>50</integer> | ||
3176 | </array> | ||
3177 | </map> | ||
3178 | <key>FloaterViewBottom</key> | 3162 | <key>FloaterViewBottom</key> |
3179 | <map> | 3163 | <map> |
3180 | <key>Comment</key> | 3164 | <key>Comment</key> |
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 @@ | |||
42 | #include "llresmgr.h" | 42 | #include "llresmgr.h" |
43 | #include "imageids.h" | 43 | #include "imageids.h" |
44 | #include "llvelocitybar.h" | 44 | #include "llvelocitybar.h" |
45 | #include "llviewercontrol.h" | ||
46 | #include "llviewerwindow.h" | 45 | #include "llviewerwindow.h" |
47 | #include "llfloaterstats.h" | 46 | #include "llfloaterstats.h" |
48 | 47 | ||
@@ -101,8 +100,11 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) | |||
101 | // | 100 | // |
102 | // Debug statistics | 101 | // Debug statistics |
103 | // | 102 | // |
104 | LLRect statsrect = gSavedSettings.getRect("FloaterStatsRect"); | 103 | r.set(rect.getWidth() - 250, |
105 | mFloaterStatsp = new LLFloaterStats(statsrect); | 104 | rect.getHeight() - 50, |
105 | rect.getWidth(), | ||
106 | rect.getHeight() - 450); | ||
107 | mFloaterStatsp = new LLFloaterStats(r); | ||
106 | 108 | ||
107 | mFloaterStatsp->setFollowsTop(); | 109 | mFloaterStatsp->setFollowsTop(); |
108 | mFloaterStatsp->setFollowsRight(); | 110 | 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 @@ | |||
38 | #include "llfloater.h" | 38 | #include "llfloater.h" |
39 | #include "llstatview.h" | 39 | #include "llstatview.h" |
40 | #include "llscrollcontainer.h" | 40 | #include "llscrollcontainer.h" |
41 | #include "llviewercontrol.h" | ||
42 | 41 | ||
43 | const S32 LL_SCROLL_BORDER = 1; | 42 | const S32 LL_SCROLL_BORDER = 1; |
44 | 43 | ||
@@ -65,8 +64,6 @@ LLFloaterStats::LLFloaterStats(const LLRect& rect) | |||
65 | 64 | ||
66 | LLFloaterStats::~LLFloaterStats() | 65 | LLFloaterStats::~LLFloaterStats() |
67 | { | 66 | { |
68 | // save position of floater | ||
69 | gSavedSettings.setRect("FloaterStatsRect", getRect()); | ||
70 | } | 67 | } |
71 | 68 | ||
72 | void LLFloaterStats::reshape(S32 width, S32 height, BOOL called_from_parent) | 69 | void LLFloaterStats::reshape(S32 width, S32 height, BOOL called_from_parent) |