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

Adjustments to MultiAttach

Browse Source
This commit is contained in:
Siana Gearz
2011-03-26 01:06:34 +01:00
parent 919d321d4a
commit b6b18b0693
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llagent.cpp
View File

@@ -7348,9 +7348,10 @@ void LLAgent::makeNewOutfit(
return;
}
BOOL fUseLinks = !gSavedSettings.getBOOL("UseInventoryLinks") &&
BOOL fUseLinks = gSavedSettings.getBOOL("UseInventoryLinks") &&
gHippoGridManager->getConnectedGrid()->isSecondLife();
BOOL fUseOutfits = gSavedSettings.getBOOL("UseOutfitFolders");
BOOL fUseOutfits = gSavedSettings.getBOOL("UseOutfitFolders") &&
gHippoGridManager->getConnectedGrid()->isSecondLife();
LLAssetType::EType typeDest = (fUseOutfits) ? LLAssetType::AT_MY_OUTFITS : LLAssetType::AT_CLOTHING;
LLAssetType::EType typeFolder = (fUseOutfits) ? LLAssetType::AT_OUTFIT : LLAssetType::AT_NONE;

8
indra/newview/llfloatercustomize.cpp
View File

@@ -76,6 +76,7 @@
#include "lluictrlfactory.h"
#include "llfilepicker.h"
#include "hippogridmanager.h"
using namespace LLVOAvatarDefines;
@@ -219,6 +220,13 @@ public:
}
}
if(!gHippoGridManager->getConnectedGrid()->isSecondLife()) {
childSetEnabled("checkbox_use_links", FALSE);
childSetValue("checkbox_use_links", FALSE);
childSetEnabled("checkbox_use_outfits", FALSE);
childSetValue("checkbox_use_outfits", FALSE);
}
childSetAction("Save", onSave, this );
childSetAction("Cancel", onCancel, this );
childSetAction("Check All", onCheckAll, this );

3
indra/newview/llinventorybridge.cpp
View File

@@ -4179,7 +4179,8 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
{
items.push_back(std::string("Attach Separator"));
items.push_back(std::string("Object Wear"));
items.push_back(std::string("Object Add"));
if (gHippoGridManager->getConnectedGrid()->isSecondLife())
items.push_back(std::string("Object Add"));
if (!avatarp->canAttachMoreObjects())
{
disabled_items.push_back(std::string("Object Add"));

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

@@ -263,7 +263,7 @@
<on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
</menu_item_call>
<menu_item_separator name="Attach Separator" />
<menu_item_call bottom_delta="-18" height="18" label="Restore to Last Position" left="0" mouse_opaque="true"
<menu_item_call bottom_delta="-18" height="18" label="Restore in World" left="0" mouse_opaque="true"
name="Restore to Last Position" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
</menu_item_call>
@@ -271,7 +271,7 @@
name="Object Wear" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
</menu_item_call>
<menu_item_call bottom_delta="-18" height="18" label="Add" left="0" mouse_opaque="true"
<menu_item_call bottom_delta="-18" height="18" label="Add to Worn" left="0" mouse_opaque="true"
name="Object Add" width="128">
<on_click filter="" function="Inventory.DoToSelected" userdata="wear_add" />
</menu_item_call>