summaryrefslogtreecommitdiff
path: root/indra/newview/res/resource.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-04-15 10:22:42 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-04-15 10:22:42 +0100
commit10905a7ed1d650c63f596d0e4511494864b68cd3 (patch)
treeb8a5fa798a8907669832b4cedad682804b6db08b /indra/newview/res/resource.h
parent1497a375535e4a79a876af58b9a3f6f3651ba55b (diff)
parentfcb36144dd78d0fa9cacc6fd6e036846493ea2a2 (diff)
merge from viewer-hotfix
Diffstat (limited to 'indra/newview/res/resource.h')
-rw-r--r--indra/newview/res/resource.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h
index da27e47dfb..6cabd5e10b 100644
--- a/indra/newview/res/resource.h
+++ b/indra/newview/res/resource.h
@@ -170,14 +170,12 @@
#define IDC_COMBO1 1138
#define IDC_COMBO_FARM 1138
#define ID_TESTMENU_TEST 40001
-#define IDC_STATIC -1
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 159
-#define _APS_NEXT_RESOURCE_VALUE 167
+#define _APS_NEXT_RESOURCE_VALUE 173
#define _APS_NEXT_COMMAND_VALUE 40002
#define _APS_NEXT_CONTROL_VALUE 1139
#define _APS_NEXT_SYMED_VALUE 101