diff options
| author | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-08-20 10:15:37 -0700 |
| commit | 6bbd490107abe162c114ccd990636ae6b16f46f8 (patch) | |
| tree | 13d7f4c1da1f28fe7ed8b73bcea82cea35ba9526 /indra/newview/llbottomtray.cpp | |
| parent | 48e0087ce3096e3ebe778124cdb21b87eedcc07c (diff) | |
| parent | 02d8197019dcecec7aee80a104c4644ddb4807ca (diff) | |
merge
Diffstat (limited to 'indra/newview/llbottomtray.cpp')
| -rw-r--r-- | indra/newview/llbottomtray.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llbottomtray.cpp b/indra/newview/llbottomtray.cpp index 310b406bfd..c4eda5f107 100644 --- a/indra/newview/llbottomtray.cpp +++ b/indra/newview/llbottomtray.cpp @@ -112,7 +112,7 @@ public: mGesturePanel(NULL) { mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL); - buildPanel(this, "panel_bottomtray_lite.xml"); + buildFromFile("panel_bottomtray_lite.xml"); // Necessary for focus movement among child controls setFocusRoot(TRUE); } @@ -163,7 +163,7 @@ LLBottomTray::LLBottomTray(const LLSD&) mFactoryMap["chat_bar"] = LLCallbackMap(LLBottomTray::createNearbyChatBar, NULL); - buildPanel(this,"panel_bottomtray.xml"); + buildFromFile("panel_bottomtray.xml"); LLUICtrl::CommitCallbackRegistry::defaultRegistrar().add("CameraPresets.ChangeView", boost::bind(&LLFloaterCamera::onClickCameraItem, _2)); |