diff options
author | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
---|---|---|
committer | David Walter Seikel | 2013-08-30 21:42:45 +1000 |
commit | 56a1de48ee43bfacbd3ef2859f392082a26bc814 (patch) | |
tree | 03bd6092dab42985e536b84d2f311a3a12e4edb4 /linden/indra/llui/llfloater.cpp | |
parent | Added a licensing note about gpg.vs, as used to build OTR on Windows. (diff) | |
parent | Merge remote-tracking branch 'origin/next' into WL-refactor (diff) | |
download | meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.zip meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.gz meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.bz2 meta-impy-56a1de48ee43bfacbd3ef2859f392082a26bc814.tar.xz |
Merge remote-tracking branch 'imprudence/next' into next
Unless otherwise stated, Imprudence changes accepted. The three images seem to be the same.
Conflicts:
.gitignore
linden/indra/develop.py
linden/indra/llcommon/llsdserialize_xml.cpp
linden/indra/newview/CMakeLists.txt
Manually combined MOAP, OTR, and WL changes from both.
linden/indra/newview/app_settings/default_grids.xml
Manually merged the grid collection.
Also updated IG info.
linden/indra/newview/hippoupdate.cpp
linden/indra/newview/llettherebelight.cpp
Just used the Imprudence copy.
linden/indra/newview/llviewermessage.cpp
Keep unbranding.
linden/indra/newview/llvoavatar.cpp
Manually merge client tags.
linden/indra/newview/res/viewerRes.rc
Manually merge version from Impy.
linden/indra/newview/skins/dark/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/default/html/unabletoconnect.png
linden/indra/newview/skins/default/textures/icon_top_pick.tga
linden/indra/newview/skins/default/xui/en-us/floater_about.xml
Manual merging of contributors.
linden/indra/newview/skins/gemini/colors_base.xml
Keep unbranding.
linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
linden/indra/newview/viewer_manifest.py
Manually merged boost, gstreamer, OTR, and name.
linden/indra/newview/viewerinfo.cpp
Manually merge the comment.
Diffstat (limited to 'linden/indra/llui/llfloater.cpp')
-rw-r--r-- | linden/indra/llui/llfloater.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp index 58c717a..4c4aeaf 100644 --- a/linden/indra/llui/llfloater.cpp +++ b/linden/indra/llui/llfloater.cpp | |||
@@ -277,30 +277,14 @@ void LLFloater::initFloater(const std::string& title, | |||
277 | mMinimized = FALSE; | 277 | mMinimized = FALSE; |
278 | mExpandedRect.set(0,0,0,0); | 278 | mExpandedRect.set(0,0,0,0); |
279 | 279 | ||
280 | S32 close_pad; // space to the right of close box | ||
281 | S32 close_box_size; // For layout purposes, how big is the close box? | 280 | S32 close_box_size; // For layout purposes, how big is the close box? |
282 | if (close_btn) | 281 | if (close_btn) |
283 | { | 282 | { |
284 | close_box_size = LLFLOATER_CLOSE_BOX_SIZE; | 283 | close_box_size = LLFLOATER_CLOSE_BOX_SIZE; |
285 | close_pad = 0; | ||
286 | } | 284 | } |
287 | else | 285 | else |
288 | { | 286 | { |
289 | close_box_size = 0; | 287 | close_box_size = 0; |
290 | close_pad = 0; | ||
291 | } | ||
292 | |||
293 | S32 minimize_box_size; | ||
294 | S32 minimize_pad; | ||
295 | if (minimizable && !drag_on_left) | ||
296 | { | ||
297 | minimize_box_size = LLFLOATER_CLOSE_BOX_SIZE; | ||
298 | minimize_pad = 0; | ||
299 | } | ||
300 | else | ||
301 | { | ||
302 | minimize_box_size = 0; | ||
303 | minimize_pad = 0; | ||
304 | } | 288 | } |
305 | 289 | ||
306 | // Drag Handle | 290 | // Drag Handle |