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

Interim commit before diving into reworking the inventory panel.

Browse Source
This commit is contained in:
Shyotl
2012-02-16 19:25:59 -06:00
parent a90d7bbb46
commit ae7b12f230
94 changed files with 15690 additions and 8311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llinventoryactions.cpp
View File

@@ -41,6 +41,7 @@
#include "message.h"
#include "llagent.h"
#include "llagentwearables.h"
#include "llcallingcard.h"
#include "llcheckboxctrl.h" // for radio buttons
#include "llfoldervieweventlistener.h"
@@ -163,15 +164,9 @@ bool doToSelected(LLFolderView* folder, std::string action)
LLInvFVBridge* bridge = (LLInvFVBridge*)folder_item->getListener();
if(!bridge) continue;
bridge->performAction(folder, model, action);
bridge->performAction(model, action);
}
LLFloater::setFloaterHost(NULL);
if (multi_previewp)
{
@@ -389,12 +384,7 @@ void do_create(LLInventoryModel *model, LLInventoryPanel *ptr, std::string type,
else
{
LLWearableType::EType wear_type = LLWearableType::typeNameToType(type);
if(wear_type != LLWearableType::WT_NONE)
{
LLFolderType::EType folder_type = LLFolderType::assetTypeToFolderType(LLWearableType::getAssetType(wear_type));
LLUUID parent_id = self ? self->getUUID() : gInventory.findCategoryUUIDForType(folder_type);
LLFolderBridge::createWearable(parent_id, wear_type);
}
LLAgentWearables::createWearable(wear_type, false, self ? self->getUUID() : LLUUID::null);
}
ptr->getRootFolder()->setNeedsAutoRename(TRUE);
}