diff options
| author | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-22 19:11:29 -0700 |
| commit | abe758d45fa3dd3524a4c7a9667e4f02c3de8eac (patch) | |
| tree | 7ac140c51c22a42c693b0930898e0996a807ecb8 /indra/newview/llfloaterjoystick.cpp | |
| parent | 264b549bcb991f4cdd6889f06b8f7fbe8740e32a (diff) | |
| parent | b124d45b4ef714acfe629af554768950dcdd5f2c (diff) | |
merge
Diffstat (limited to 'indra/newview/llfloaterjoystick.cpp')
| -rw-r--r-- | indra/newview/llfloaterjoystick.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llfloaterjoystick.cpp b/indra/newview/llfloaterjoystick.cpp index e1994bb8bc..c37798c330 100644 --- a/indra/newview/llfloaterjoystick.cpp +++ b/indra/newview/llfloaterjoystick.cpp @@ -44,8 +44,6 @@ LLFloaterJoystick::LLFloaterJoystick(const LLSD& data) : LLFloater(data) { - //Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_joystick.xml"); - initFromSettings(); } |