diff options
author | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
commit | 58ac85223e976556b060ca0ff345f1a96d8f7848 (patch) | |
tree | 1e8901e1a47304829d67e5e71b178a5f47142c7c /indra/newview/llfloateropenobject.cpp | |
parent | 92195c479f597538a55dfa8b2e02c1b4908a2259 (diff) | |
parent | fbcbfb88059b0d669592407205dd4167257a2395 (diff) |
merge
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
-rw-r--r-- | indra/newview/llfloateropenobject.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index d6f6ba9e5b..8b6619def2 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -56,7 +56,6 @@ LLFloaterOpenObject::LLFloaterOpenObject(const LLSD& key) mPanelInventoryObject(NULL), mDirty(TRUE) { -// LLUICtrlFactory::getInstance()->buildFloater(this,"floater_openobject.xml"); mCommitCallbackRegistrar.add("OpenObject.MoveToInventory", boost::bind(&LLFloaterOpenObject::onClickMoveToInventory, this)); mCommitCallbackRegistrar.add("OpenObject.MoveAndWear", boost::bind(&LLFloaterOpenObject::onClickMoveAndWear, this)); } |