diff options
author | McCabe Maxsted | 2009-03-07 18:32:19 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-03-07 18:32:19 -0700 |
commit | b6988f60c05aac3390ffd4634a1d6cc8c1a5dec1 (patch) | |
tree | f8c2fa243c30d150c0ffbb9b125ec027bdee4517 /linden/indra/newview | |
parent | Applied memleak patch from VWR-9400 (diff) | |
download | meta-impy-b6988f60c05aac3390ffd4634a1d6cc8c1a5dec1.zip meta-impy-b6988f60c05aac3390ffd4634a1d6cc8c1a5dec1.tar.gz meta-impy-b6988f60c05aac3390ffd4634a1d6cc8c1a5dec1.tar.bz2 meta-impy-b6988f60c05aac3390ffd4634a1d6cc8c1a5dec1.tar.xz |
Applied remember stats position and size patch from Latif Khalifa
Diffstat (limited to 'linden/indra/newview')
-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, 22 insertions, 5 deletions
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 7405aad..1c2b694 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml | |||
@@ -3159,6 +3159,22 @@ | |||
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> | ||
3162 | <key>FloaterViewBottom</key> | 3178 | <key>FloaterViewBottom</key> |
3163 | <map> | 3179 | <map> |
3164 | <key>Comment</key> | 3180 | <key>Comment</key> |
diff --git a/linden/indra/newview/lldebugview.cpp b/linden/indra/newview/lldebugview.cpp index 69d724e..91f5524 100644 --- a/linden/indra/newview/lldebugview.cpp +++ b/linden/indra/newview/lldebugview.cpp | |||
@@ -42,6 +42,7 @@ | |||
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" | ||
45 | #include "llviewerwindow.h" | 46 | #include "llviewerwindow.h" |
46 | #include "llfloaterstats.h" | 47 | #include "llfloaterstats.h" |
47 | 48 | ||
@@ -100,11 +101,8 @@ LLDebugView::LLDebugView(const std::string& name, const LLRect &rect) | |||
100 | // | 101 | // |
101 | // Debug statistics | 102 | // Debug statistics |
102 | // | 103 | // |
103 | r.set(rect.getWidth() - 250, | 104 | LLRect statsrect = gSavedSettings.getRect("FloaterStatsRect"); |
104 | rect.getHeight() - 50, | 105 | mFloaterStatsp = new LLFloaterStats(statsrect); |
105 | rect.getWidth(), | ||
106 | rect.getHeight() - 450); | ||
107 | mFloaterStatsp = new LLFloaterStats(r); | ||
108 | 106 | ||
109 | mFloaterStatsp->setFollowsTop(); | 107 | mFloaterStatsp->setFollowsTop(); |
110 | mFloaterStatsp->setFollowsRight(); | 108 | mFloaterStatsp->setFollowsRight(); |
diff --git a/linden/indra/newview/llfloaterstats.cpp b/linden/indra/newview/llfloaterstats.cpp index 745cb27..17e600e 100644 --- a/linden/indra/newview/llfloaterstats.cpp +++ b/linden/indra/newview/llfloaterstats.cpp | |||
@@ -38,6 +38,7 @@ | |||
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" | ||
41 | 42 | ||
42 | const S32 LL_SCROLL_BORDER = 1; | 43 | const S32 LL_SCROLL_BORDER = 1; |
43 | 44 | ||
@@ -64,6 +65,8 @@ LLFloaterStats::LLFloaterStats(const LLRect& rect) | |||
64 | 65 | ||
65 | LLFloaterStats::~LLFloaterStats() | 66 | LLFloaterStats::~LLFloaterStats() |
66 | { | 67 | { |
68 | // save position of floater | ||
69 | gSavedSettings.setRect("FloaterStatsRect", getRect()); | ||
67 | } | 70 | } |
68 | 71 | ||
69 | void LLFloaterStats::reshape(S32 width, S32 height, BOOL called_from_parent) | 72 | void LLFloaterStats::reshape(S32 width, S32 height, BOOL called_from_parent) |