summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepanelinventory.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2015-04-24 10:08:13 -0400
commit76fb5f1542297a7e1afdf983d8a0db459fc0b8ab (patch)
tree0c35366715e4a944361f5ec1cbf61535b04b6ab0 /indra/newview/llsidepanelinventory.cpp
parentff42e557848158d5a01cc260bac0bbf974650934 (diff)
parentfde0868231a25b8c9ce03a86cb53f1738d35688d (diff)
merge with viewer tools update
Diffstat (limited to 'indra/newview/llsidepanelinventory.cpp')
-rwxr-xr-xindra/newview/llsidepanelinventory.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 4970eec636..0e23e2ad10 100755
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -70,10 +70,7 @@ static LLPanelInjector<LLSidepanelInventory> t_inventory("sidepanel_inventory");
static const char * const INBOX_BUTTON_NAME = "inbox_btn";
static const char * const INBOX_LAYOUT_PANEL_NAME = "inbox_layout_panel";
-static const char * const MAIN_INVENTORY_LAYOUT_PANEL_NAME = "main_inventory_layout_panel";
-
static const char * const INVENTORY_LAYOUT_STACK_NAME = "inventory_layout_stack";
-
static const char * const MARKETPLACE_INBOX_PANEL = "marketplace_inbox";
//