diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-06-13 15:28:13 -0400 |
| commit | 2268bf38339178f93b317693c0a6808807301d64 (patch) | |
| tree | 0a17c21975babce8422b9b62a1683947f5a58f2c /indra/newview/llfloateruipreview.cpp | |
| parent | d233d8836b610b5e5ca76a1e3bb4d63dc3592e66 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
merge changes for 3.5.3-release
Diffstat (limited to 'indra/newview/llfloateruipreview.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llfloateruipreview.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloateruipreview.cpp b/indra/newview/llfloateruipreview.cpp index 15e0b89f6c..0106a1615d 100644..100755 --- a/indra/newview/llfloateruipreview.cpp +++ b/indra/newview/llfloateruipreview.cpp @@ -855,7 +855,6 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID) LLPanel* panel = LLUICtrlFactory::create<LLPanel>(panel_params); // create a new panel panel->buildFromFile(path); // build it - LLRect new_size = panel->getRect(); // get its rectangle panel->setOrigin(2,2); // reset its origin point so it's not offset by -left or other XUI attributes (*floaterp)->setTitle(path); // use the file name as its title, since panels have no guaranteed meaningful name attribute panel->setUseBoundingRect(TRUE); // enable the use of its outer bounding rect (normally disabled because it's O(n) on the number of sub-elements) |