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

Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2014-08-22 03:55:21 -05:00
parent 66597cade3 e01b9dcd39
commit f721d935e4
9 changed files with 147 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatersnapshot.cpp
View File

@@ -1787,7 +1787,7 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater, bool de
child_list_t::const_iterator it, end=childs->end();
for (it=childs->begin(); it!=end; ++it)
{
LLRadioCtrl *ctrl = dynamic_cast<LLRadioCtrl*>(*it);
LLView* ctrl = *it;
if (ctrl && (ctrl->getName() == "texture"))
{
ctrl->setLabelArg("[UPLOADFEE]", fee);

2
indra/newview/llfloatertest.cpp
View File

@@ -81,8 +81,6 @@ private:
LLIconCtrl* mIcon;
LLLineEditor* mLineEditor;
LLRadioGroup* mRadioGroup;
LLRadioCtrl* mRadio1;
LLRadioCtrl* mRadio2;
LLScrollContainer* mScroll;
LLScrollListCtrl* mScrollList;
LLTabContainer* mTab;

16
indra/newview/llinventorybridge.cpp
View File

@@ -2851,6 +2851,14 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
restoreItem();
return;
}
// <singu> Move displaced inventory to lost and found
else if ("move_to_lost_and_found" == action)
{
gInventory.changeCategoryParent(getCategory(), gInventory.findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND), TRUE);
gInventory.addChangedMask(LLInventoryObserver::REBUILD, mUUID);
gInventory.notifyObservers();
}
// </singu>
#ifdef DELETE_SYSTEM_FOLDERS
else if ("delete_system_folder" == action)
{
@@ -3365,6 +3373,14 @@ void LLFolderBridge::buildContextMenuBaseOptions(U32 flags)
mWearables=TRUE;
}
}
// <singu> Move displaced inventory to lost and found
else if (!isAgentInventory())
{
const LLUUID& library(gInventory.getLibraryRootFolderID());
if (library == mUUID || gInventory.isObjectDescendentOf(mUUID, library))
mItems.push_back(std::string("Move to Lost And Found"));
}
// </singu>
// Preemptively disable system folder removal if more than one item selected.
if ((flags & FIRST_SELECTED_ITEM) == 0)

2
indra/newview/skins/default/xui/de/strings.xml
View File

@@ -13,8 +13,6 @@
<!-- Default Args - these arguments will be replaced in all strings -->
<string name="SECOND_LIFE">Second Life</string>
<string name="APP_NAME">Singularity Viewer</string>
<string name="CAPITALIZED_APP_NAME">SINGULARITY VIEWER</string>
<string name="SECOND_LIFE_GRID">Second Life-Grid:</string>
<string name="SUPPORT_SITE">Second Life Support-Portal</string>

3
indra/newview/skins/default/xui/en-us/menu_inventory.xml
View File

@@ -227,6 +227,9 @@
name="Delete" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
</menu_item_call>
<menu_item_call label="Move to Lost And Found" mouse_opaque="true" name="Move to Lost And Found">
<on_click function="Inventory.DoToSelected" userdata="move_to_lost_and_found" />
</menu_item_call>
<menu_item_call label="Delete System Folder" mouse_opaque="true" name="Delete System Folder">
<on_click function="Inventory.DoToSelected" userdata="delete_system_folder" />
</menu_item_call>

2
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -998,7 +998,7 @@
<on_click function="PromptShowURL" name="RequestFeature_url" userdata="WebLaunchSinguIssue,http://code.google.com/p/singularity-viewer/issues/entry?template=Feature%20request"/>
</menu_item_call>
</menu>
<menu_item_call bottom="-313" enabled="true" height="19" label="About [APP_NAME]..." left="0"
<menu_item_call bottom="-313" enabled="true" height="19" label="About [SHORT_APP_NAME]..." left="0"
mouse_opaque="true" name="About Second Life..." width="166">
<on_click function="ShowFloater" userdata="about" />
</menu_item_call>

3
indra/newview/skins/default/xui/es/strings.xml
View File

@@ -21,9 +21,6 @@ Asegurate que has ingresado el URI de inicio de sesión correcto. Un ejemplo de
<!-- Default Args - these arguments will be replaced in all strings -->
<string name="SECOND_LIFE">Second Life</string>
<string name="APP_NAME">Singularity Viewer</string>
<string name="CAPITALIZED_APP_NAME">SINGULARITY VIEWER</string>
<string name="SHORT_APP_NAME">Singularity</string>
<string name="SECOND_LIFE_GRID">Grid Second Life</string>
<string name="SUPPORT_SITE">Portal de Soporte de Second Life</string>