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

COMMIT STORM:

Browse Source 
Fixes for Temp uploads so they show up as they should and are actually usable.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-08 19:09:14 -04:00
parent 4638cfbc80
commit 973f53df5e
6 changed files with 58 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llinventoryactions.cpp
View File

@@ -472,14 +472,6 @@ class LLDoCreate : public inventory_panel_listener_t
LLInventoryModel* model = mPtr->getModel();
if(!model) return false;
std::string type = userdata.asString();
// <edit>
if(type == "pretend")
{
LLFloaterNewLocalInventory* floater = new LLFloaterNewLocalInventory();
floater->center();
}
else
// </edit>
do_create(model, mPtr, type, LLFolderBridge::sSelf);
return true;
}
@@ -492,6 +484,14 @@ class LLDoCreateFloater : public inventory_listener_t
LLInventoryModel* model = mPtr->getPanel()->getModel();
if(!model) return false;
std::string type = userdata.asString();
// <edit>
if(type == "pretend")
{
LLFloaterNewLocalInventory* floater = new LLFloaterNewLocalInventory();
floater->center();
}
else
// </edit>
do_create(model, mPtr->getPanel(), type);
return true;
}