diff options
| author | Jacek Antonelli | 2009-09-09 11:38:26 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-09 11:59:42 -0500 |
| commit | ced5a5f6a0e7d294f9e477409387674fcecc532c (patch) | |
| tree | e7500de0806009c2955bef6af7103ac60ae1e8e0 /linden/indra/newview/llfloatertelehub.cpp | |
| parent | Merge branch 'objectbackup' into next (diff) | |
| parent | Commented out permissions button (todo: backport this if there's time) (diff) | |
| download | meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.zip meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.gz meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.bz2 meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Moved "Backup" pie menu item to fit "Go Here" in top-left slot.
Conflicts:
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
Diffstat (limited to 'linden/indra/newview/llfloatertelehub.cpp')
| -rw-r--r-- | linden/indra/newview/llfloatertelehub.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloatertelehub.cpp b/linden/indra/newview/llfloatertelehub.cpp index 943bc36..062306b 100644 --- a/linden/indra/newview/llfloatertelehub.cpp +++ b/linden/indra/newview/llfloatertelehub.cpp | |||
| @@ -68,7 +68,6 @@ void LLFloaterTelehub::show() | |||
| 68 | // Find tools floater, glue to bottom | 68 | // Find tools floater, glue to bottom |
| 69 | if (gFloaterTools) | 69 | if (gFloaterTools) |
| 70 | { | 70 | { |
| 71 | gFloaterTools->showMore(FALSE); | ||
| 72 | LLRect tools_rect = gFloaterTools->getRect(); | 71 | LLRect tools_rect = gFloaterTools->getRect(); |
| 73 | S32 our_width = sInstance->getRect().getWidth(); | 72 | S32 our_width = sInstance->getRect().getWidth(); |
| 74 | S32 our_height = sInstance->getRect().getHeight(); | 73 | S32 our_height = sInstance->getRect().getHeight(); |