diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 22:55:32 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-11 22:55:32 +0200 |
commit | db3991ca235f3ceefe888d03758cac5eccf1b552 (patch) | |
tree | c4712870f33c4b0fdcc13959ba2f940aa396b6b2 /indra/newview/llsidetray.cpp | |
parent | 2fd51b4c711aa7ab70da6d7e7dfcb380b87cbedf (diff) | |
parent | b34ee7f9f405e25ac606a16435ed49c7187387d8 (diff) |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llsidetray.cpp')
-rw-r--r-- | indra/newview/llsidetray.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index e8f310c27e..70dc04f575 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -101,6 +101,7 @@ LLSideTray* LLSideTray::getInstance() if (!sInstance) { sInstance = LLUICtrlFactory::createFromFile<LLSideTray>("panel_side_tray.xml",NULL, LLRootView::child_registry_t::instance()); + sInstance->setXMLFilename("panel_side_tray.xml"); } return sInstance; |