FIRE-35938, FIRE-36013 Unchecking "Add objects on double click" still adds instead of replacing
Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>master
PanteraPolnocy
parent
17ca9ac161
commit
40aaa885b7
|
|
@ -23488,7 +23488,7 @@ Change of this parameter will affect the layout of buttons in notification toast
|
|||
<key>InventoryAddAttachmentBehavior</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Defines behavior when hitting return on an inventory item</string>
|
||||
<string>Defines behavior when hitting return on an inventory item (unused in favour of FSDoubleClickAddInventoryObjects)</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
|
|
|
|||
|
|
@ -7899,8 +7899,12 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action)
|
|||
item = (LLViewerInventoryItem*)gInventory.getItem(object_id);
|
||||
if(item && gInventory.isObjectDescendentOf(object_id, gInventory.getRootFolderID()))
|
||||
{
|
||||
static LLCachedControl<bool> replace_item(gSavedSettings, "InventoryAddAttachmentBehavior", false);
|
||||
rez_attachment(item, NULL, ("attach" == action) ? replace_item() : true); // Replace if "Wear"ing.
|
||||
// <FS> Firestorm's replace on double click
|
||||
// static LLCachedControl<bool> replace_item(gSavedSettings, "InventoryAddAttachmentBehavior", false);
|
||||
// rez_attachment(item, NULL, ("attach" == action) ? replace_item() : true); // Replace if "Wear"ing.
|
||||
static LLCachedControl<bool> replace_item(gSavedSettings, "FSDoubleClickAddInventoryObjects", false);
|
||||
rez_attachment(item, NULL, ("attach" == action) ? !replace_item : true); // Replace if "Wear"ing.
|
||||
// </FS>
|
||||
}
|
||||
else if(item && item->isFinished())
|
||||
{
|
||||
|
|
@ -7943,11 +7947,13 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action)
|
|||
|
||||
void LLObjectBridge::openItem()
|
||||
{
|
||||
static LLCachedControl<bool> replace_item(gSavedSettings, "FSDoubleClickAddInventoryObjects", false); // <FS> Double-click add/replace
|
||||
// object double-click action is to wear/unwear object
|
||||
performAction(getInventoryModel(),
|
||||
// <FS> Double-click add/replace
|
||||
//get_is_item_worn(mUUID) ? "detach" : "attach");
|
||||
get_is_item_worn(mUUID) ? "detach" : gSavedSettings.getBOOL("FSDoubleClickAddInventoryObjects") ? "wear_add" : "attach");
|
||||
get_is_item_worn(mUUID) ? "detach" : replace_item ? "wear_add" : "attach");
|
||||
// </FS>
|
||||
}
|
||||
|
||||
std::string LLObjectBridge::getLabelSuffix() const
|
||||
|
|
@ -9164,7 +9170,9 @@ void LLObjectBridgeAction::attachOrDetach()
|
|||
// <FS:Ansariel> Double-click add/replace option
|
||||
//static LLCachedControl<bool> inventory_linking(gSavedSettings, "InventoryAddAttachmentBehavior", false);
|
||||
//LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, inventory_linking()); // Don't replace if adding.
|
||||
LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, !gSavedSettings.getBOOL("FSDoubleClickAddInventoryObjects")); // Don't replace if adding.
|
||||
static LLCachedControl<bool> replace_item(gSavedSettings, "FSDoubleClickAddInventoryObjects", false);
|
||||
LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, !replace_item); // Don't replace if adding.
|
||||
// </FS>
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
Drücken von Eingabetaste bei einem Avatar-Anhang
|
||||
</text>
|
||||
<combo_box name="attach_combo">
|
||||
<combo_box.item label="Fügt Anhang hinzu (empfohlen)" name="0"/>
|
||||
<combo_box.item label="Anhängen (entfernt bisherigen Anhang am entsprechenden Punkt)" name="1"/>
|
||||
<combo_box.item label="Fügt Anhang hinzu (empfohlen)" name="1"/>
|
||||
<combo_box.item label="Anhängen (entfernt bisherigen Anhang am entsprechenden Punkt)" name="0"/>
|
||||
</combo_box>
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -278,11 +278,11 @@
|
|||
name="attachment_return_txt"
|
||||
font="SansSerifMedium"
|
||||
text_color="White"
|
||||
width="350">
|
||||
Pressing enter on an avatar attachment
|
||||
width="420">
|
||||
Pressing enter or double clicking on an avatar attachment
|
||||
</text>
|
||||
<combo_box
|
||||
control_name="InventoryAddAttachmentBehavior"
|
||||
control_name="FSDoubleClickAddInventoryObjects"
|
||||
layout="topleft"
|
||||
follows="left|top"
|
||||
top_pad="8"
|
||||
|
|
@ -292,11 +292,11 @@
|
|||
width="350">
|
||||
<combo_box.item
|
||||
label="Adds attachment (recommended)"
|
||||
name="0"
|
||||
value="0"/>
|
||||
<combo_box.item
|
||||
label="Wear (removes attachment at that point)"
|
||||
name="1"
|
||||
value="1"/>
|
||||
<combo_box.item
|
||||
label="Wear (removes attachment at that point)"
|
||||
name="0"
|
||||
value="0"/>
|
||||
</combo_box>
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
Appuyer sur Entrée sur un élément attaché à l'avatar
|
||||
</text>
|
||||
<combo_box name="attach_combo">
|
||||
<combo_box.item label="Ajoute l'élément (recommandé)" name="0"/>
|
||||
<combo_box.item label="Porte (Supprime l'élément attaché à cet endroit)" name="1"/>
|
||||
<combo_box.item label="Ajoute l'élément (recommandé)" name="1"/>
|
||||
<combo_box.item label="Porte (Supprime l'élément attaché à cet endroit)" name="0"/>
|
||||
</combo_box>
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
アバターの装着物でEnterキーを押したときの動作
|
||||
</text>
|
||||
<combo_box name="attach_combo">
|
||||
<combo_box.item label="装着物を追加（推奨）" name="0"/>
|
||||
<combo_box.item label="着用（その場所の装着物を取り除きます）" name="1"/>
|
||||
<combo_box.item label="装着物を追加（推奨）" name="1"/>
|
||||
<combo_box.item label="着用（その場所の装着物を取り除きます）" name="0"/>
|
||||
</combo_box>
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
<check_box label="Gwiazdka przy folderach z ulubionymi" name="favorite_hollow_star" />
|
||||
<check_box label="Kolor tekstu" name="favorites_color" />
|
||||
<text name="attachment_return_txt">
|
||||
Naciśnięcie "Enter" na dodatku awatara
|
||||
Naciśnięcie "Enter" lub podwójne klikanie na dodatku awatara
|
||||
</text>
|
||||
<combo_box name="attach_combo">
|
||||
<combo_box.item label="Dodaje (zalecane)" name="0" />
|
||||
<combo_box.item label="Zakłada (usuwa dodatek z tego miejsca)" name="1" />
|
||||
<combo_box.item label="Dodaje (zalecane)" name="1" />
|
||||
<combo_box.item label="Zastępuje (usuwa dodatek z tego miejsca)" name="0" />
|
||||
</combo_box>
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
Нажатие Enter при прикреплении аватара
|
||||
</text>
|
||||
<combo_box name="attach_combo" width="350">
|
||||
<combo_box.item label="Добавляет прикрепление (рекомендуется)" name="0"/>
|
||||
<combo_box.item label="Заменяет (удаляет прикрепление в этой точке)" name="1"/>
|
||||
<combo_box.item label="Добавляет прикрепление (рекомендуется)" name="1"/>
|
||||
<combo_box.item label="Заменяет (удаляет прикрепление в этой точке)" name="0"/>
|
||||
</combo_box>
|
||||
</floater>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
在化身附件上按下“Enter”鍵
|
||||
</text>
|
||||
<combo_box name="attach_combo">
|
||||
<combo_box.item label="添加附件（推薦）" name="0" />
|
||||
<combo_box.item label="穿上（替換附著點上的物件）" name="1" />
|
||||
<combo_box.item label="添加附件（推薦）" name="1" />
|
||||
<combo_box.item label="穿上（替換附著點上的物件）" name="0" />
|
||||
</combo_box>
|
||||
</floater>
|
||||
Loading…
Reference in New Issue