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

3
indra/newview/lllocalinventory.cpp
View File

@@ -53,7 +53,7 @@ LLUUID LLLocalInventory::addItem(std::string name, int type, LLUUID asset_id)
"", "",
LLSaleInfo::DEFAULT, LLSaleInfo::DEFAULT,
0, 0,
0); time_corrected());
addItem(item); addItem(item);
return item_id; return item_id;
} }
@@ -63,6 +63,7 @@ void LLLocalInventory::addItem(LLViewerInventoryItem* item)
//gInventory.addPretendItem(item); //gInventory.addPretendItem(item);
LLInventoryModel::update_map_t update; LLInventoryModel::update_map_t update;
++update[item->getParentUUID()]; ++update[item->getParentUUID()];
item->updateServer(TRUE);
gInventory.accountForUpdate(update); gInventory.accountForUpdate(update);
gInventory.updateItem(item); gInventory.updateItem(item);
gInventory.notifyObservers(); gInventory.notifyObservers();

17
indra/newview/llviewermenufile.cpp
View File

@@ -1256,12 +1256,15 @@ void temp_upload_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
item_id.generate(); item_id.generate();
LLPermissions* perms = new LLPermissions(); LLPermissions* perms = new LLPermissions();
perms->set(LLPermissions::DEFAULT); perms->set(LLPermissions::DEFAULT);
perms->setOwnerAndGroup(LLUUID::null, LLUUID::null, LLUUID::null, false); perms->setOwnerAndGroup(gAgentID, gAgentID, gAgentID, false);
perms->setMaskBase(0);
perms->setMaskEveryone(0);
perms->setMaskGroup(0); perms->setMaskBase(PERM_ALL);
perms->setMaskNext(0); perms->setMaskOwner(PERM_ALL);
perms->setMaskOwner(0); perms->setMaskEveryone(PERM_ALL);
perms->setMaskGroup(PERM_ALL);
perms->setMaskNext(PERM_ALL);
LLViewerInventoryItem* item = new LLViewerInventoryItem( LLViewerInventoryItem* item = new LLViewerInventoryItem(
item_id, item_id,
gLocalInventoryRoot, gLocalInventoryRoot,
@@ -1273,7 +1276,7 @@ void temp_upload_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt
data->mAssetInfo.getDescription(), data->mAssetInfo.getDescription(),
LLSaleInfo::DEFAULT, LLSaleInfo::DEFAULT,
0, 0,
0); time_corrected());
LLLocalInventory::addItem(item); LLLocalInventory::addItem(item);
} }
else else

4
indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
View File

@@ -22,8 +22,8 @@
halign="center" height="20" label="Default" label_selected="Default" halign="center" height="20" label="Default" label_selected="Default"
left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" /> left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" />
<button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall" <button bottom="-228" enabled="false" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="None" label_selected="None" left="72" halign="center" height="20" label="Alpha" label_selected="Alpha" left="72"
mouse_opaque="true" name="None" scale_image="true" width="64" /> mouse_opaque="true" name="Alpha" scale_image="true" width="64" />
<button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall" <button bottom="-252" enabled="true" follows="left|bottom" font="SansSerifSmall"
halign="center" height="20" label="Blank" label_selected="Blank" left="4" halign="center" height="20" label="Blank" label_selected="Blank" left="4"
mouse_opaque="true" name="Blank" scale_image="true" width="64" /> mouse_opaque="true" name="Blank" scale_image="true" width="64" />