aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterjoystick.cpp
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-02-03 15:23:22 +1000
committerDavid Walter Seikel2014-02-03 15:23:22 +1000
commitd056a17f05a1f90708f554651475e116a2ddbd68 (patch)
tree07fa4f1cca2a25548b8d2d6b4752b07d8efbd2ff /linden/indra/newview/llfloaterjoystick.cpp
parentUpdating tree and volume LOD. These go to eleven. (diff)
parentFix up OTR prefs to not crash. (diff)
downloadmeta-impy-next.zip
meta-impy-next.tar.gz
meta-impy-next.tar.bz2
meta-impy-next.tar.xz
Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext
Diffstat (limited to 'linden/indra/newview/llfloaterjoystick.cpp')
-rw-r--r--linden/indra/newview/llfloaterjoystick.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index fd39621..b96af5b 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -100,7 +100,6 @@ BOOL LLFloaterJoystick::postBuild()
100 if (child) 100 if (child)
101 { 101 {
102 LLRect r = child->getRect(); 102 LLRect r = child->getRect();
103 LLRect f = getRect();
104 rect = LLRect(350, r.mTop, r.mRight + 200, 0); 103 rect = LLRect(350, r.mTop, r.mRight + 200, 0);
105 } 104 }
106 105