diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 27e615e92..1956a09e3 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -349,7 +349,7 @@ void LLFolderViewItem::refresh() LLStringUtil::toUpper(searchable_label_desc); LLStringUtil::toUpper(searchable_label_all); - if (mSearchableLabel.compare(searchable_label) || + if (mSearchableLabel.compare(searchable_label) || mSearchableLabelCreator.compare(searchable_label_creator) || mSearchableLabelDesc.compare(searchable_label_desc) || mSearchableLabelAll.compare(searchable_label_all)) @@ -4746,7 +4746,7 @@ std::string::size_type LLInventoryFilter::getStringMatchOffset() const BOOL LLInventoryFilter::isNotDefault() { return mFilterOps.mFilterTypes != mDefaultFilterOps.mFilterTypes - || mFilterSubString.size() + || mFilterSubString.size() || mFilterWorn || mFilterOps.mPermissions != mDefaultFilterOps.mPermissions || mFilterOps.mMinDate != mDefaultFilterOps.mMinDate diff --git a/indra/newview/llinventoryactions.cpp b/indra/newview/llinventoryactions.cpp index 41abf6558..b48740f14 100644 --- a/indra/newview/llinventoryactions.cpp +++ b/indra/newview/llinventoryactions.cpp @@ -472,14 +472,6 @@ class LLDoCreate : public inventory_panel_listener_t LLInventoryModel* model = mPtr->getModel(); if(!model) return false; std::string type = userdata.asString(); - // - if(type == "pretend") - { - LLFloaterNewLocalInventory* floater = new LLFloaterNewLocalInventory(); - floater->center(); - } - else - // 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(); + // + if(type == "pretend") + { + LLFloaterNewLocalInventory* floater = new LLFloaterNewLocalInventory(); + floater->center(); + } + else + // do_create(model, mPtr->getPanel(), type); return true; } diff --git a/indra/newview/lllocalinventory.cpp b/indra/newview/lllocalinventory.cpp index 0810c2a2c..777e70b63 100644 --- a/indra/newview/lllocalinventory.cpp +++ b/indra/newview/lllocalinventory.cpp @@ -53,7 +53,7 @@ LLUUID LLLocalInventory::addItem(std::string name, int type, LLUUID asset_id) "", LLSaleInfo::DEFAULT, 0, - 0); + time_corrected()); addItem(item); return item_id; } @@ -63,6 +63,7 @@ void LLLocalInventory::addItem(LLViewerInventoryItem* item) //gInventory.addPretendItem(item); LLInventoryModel::update_map_t update; ++update[item->getParentUUID()]; + item->updateServer(TRUE); gInventory.accountForUpdate(update); gInventory.updateItem(item); gInventory.notifyObservers(); diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 3a54bbc03..4793cf964 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -1256,12 +1256,15 @@ void temp_upload_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt item_id.generate(); LLPermissions* perms = new LLPermissions(); perms->set(LLPermissions::DEFAULT); - perms->setOwnerAndGroup(LLUUID::null, LLUUID::null, LLUUID::null, false); - perms->setMaskBase(0); - perms->setMaskEveryone(0); - perms->setMaskGroup(0); - perms->setMaskNext(0); - perms->setMaskOwner(0); + perms->setOwnerAndGroup(gAgentID, gAgentID, gAgentID, false); + + + perms->setMaskBase(PERM_ALL); + perms->setMaskOwner(PERM_ALL); + perms->setMaskEveryone(PERM_ALL); + perms->setMaskGroup(PERM_ALL); + perms->setMaskNext(PERM_ALL); + LLViewerInventoryItem* item = new LLViewerInventoryItem( item_id, gLocalInventoryRoot, @@ -1273,7 +1276,7 @@ void temp_upload_callback(const LLUUID& uuid, void* user_data, S32 result, LLExt data->mAssetInfo.getDescription(), LLSaleInfo::DEFAULT, 0, - 0); + time_corrected()); LLLocalInventory::addItem(item); } else diff --git a/indra/newview/skins/default/xui/en-us/floater_inventory.xml b/indra/newview/skins/default/xui/en-us/floater_inventory.xml index 04cdb2b5f..27829020c 100644 --- a/indra/newview/skins/default/xui/en-us/floater_inventory.xml +++ b/indra/newview/skins/default/xui/en-us/floater_inventory.xml @@ -4,40 +4,40 @@ mouse_opaque="true" name="Inventory" rect_control="FloaterInventoryRect" title="Inventory" width="467"> -Quick Filter: - - All Types - Animations - Calling Cards - Clothing / Body Parts - Gestures - Landmarks - Notecards - Objects - Scripts - Sounds - Textures - Snapshots - Custom... - - All Types - - Animations - Calling Cards - Clothing / Body Parts - Gestures - Landmarks - Notecards - Objects - Scripts - Sounds - Textures - Snapshots - - Custom... - + left="6" mouse_opaque="true" name="inventory search editor" width="455" /> + Quick Filter: + + All Types + Animations + Calling Cards + Clothing / Body Parts + Gestures + Landmarks + Notecards + Objects + Scripts + Sounds + Textures + Snapshots + Custom... + + All Types + + Animations + Calling Cards + Clothing / Body Parts + Gestures + Landmarks + Notecards + Objects + Scripts + Sounds + Textures + Snapshots + + Custom... + diff --git a/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml index a8ffc80df..fda803fa5 100644 --- a/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml @@ -22,8 +22,8 @@ halign="center" height="20" label="Default" label_selected="Default" left="4" mouse_opaque="true" name="Default" scale_image="true" width="64" />