Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Innitial commit. Pulled minor changes out of bulk of changes comming for multi-wearables.

Browse Source
This commit is contained in:
Shyotl
2012-02-16 12:00:38 -06:00
parent 9f9a4cbaaf
commit a90d7bbb46
79 changed files with 1162 additions and 1292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloateropenobject.cpp
View File

@@ -50,7 +50,7 @@
#include "llinventorybridge.h"
#include "llinventorymodel.h"
#include "llinventorypanel.h"
#include "llpanelinventory.h"
#include "llpanelobjectinventory.h"
#include "llselectmgr.h"
#include "lluiconstants.h"
#include "llviewerobject.h"
@@ -211,11 +211,10 @@ void LLFloaterOpenObject::callbackMoveInventory(S32 result, void* data)
if (result == 0)
{
LLInventoryView::showAgentInventory();
LLInventoryView* view = LLInventoryView::getActiveInventory();
if (view)
LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel();
if (active_panel)
{
view->getPanel()->setSelection(cat->mCatID, TAKE_FOCUS_NO);
active_panel->setSelection(cat->mCatID, TAKE_FOCUS_NO);
}
}
@@ -243,6 +242,6 @@ void LLFloaterOpenObject::onClickMoveAndWear(void* data)
void* LLFloaterOpenObject::createPanelInventory(void* data)
{
LLFloaterOpenObject* floater = (LLFloaterOpenObject*)data;
floater->mPanelInventory = new LLPanelInventory(std::string("Object Contents"), LLRect());
floater->mPanelInventory = new LLPanelObjectInventory(std::string("Object Contents"), LLRect());
return floater->mPanelInventory;
}