diff options
author | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2010-09-16 19:45:57 -0700 |
commit | 1911993cc7761216c70b95e77b49da383c9e162d (patch) | |
tree | 23ec59769bcaf192324e48141c94affe0ebf2ea0 /indra/newview/llfloateropenobject.cpp | |
parent | 30c8979e157a4503509360f0c70d609eb97d6db9 (diff) | |
parent | 83c01b041d5b6527b3741b73d075afc4b7ad134c (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)); } |