diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:37 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-10 10:30:37 +0300 |
commit | 5af93ff0d53606db3dca727a8cd1b73d7c37d70b (patch) | |
tree | 2deaa98bcd99fd2860da758a92816c3bdb838acd /indra/newview/llinventorybridge.cpp | |
parent | a902138de15067a86a6aeb02fdabd094873da0b2 (diff) | |
parent | 0acee937f55e6d1a198be2549d5cb55a0403dd4d (diff) |
Merge pull request #1177 from secondlife/marchcat/c-merge
Release (Maint W) -> Maint C merge
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 932a0316dd..7a9d0ff7a7 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1778,7 +1778,7 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action) } else if ("show_in_main_panel" == action) { - LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mUUID, TRUE); + LLInventoryPanel::openInventoryPanelAndSetSelection(true, mUUID, true); return; } else if ("cut" == action) @@ -3409,7 +3409,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action) } else if ("show_in_main_panel" == action) { - LLInventoryPanel::openInventoryPanelAndSetSelection(TRUE, mUUID, TRUE); + LLInventoryPanel::openInventoryPanelAndSetSelection(true, mUUID, true); return; } else if ("cut" == action) |