diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-16 14:51:15 -0700 |
| commit | 663d8f7870c2858956aea8ab20129fd084a96dc8 (patch) | |
| tree | 5ea7eaf40a018fbabaee165cc511998c5390f181 /indra/newview/res/resource.h | |
| parent | ba057d34cdc8fb91093aadaaad22618b6371cd0f (diff) | |
| parent | 8cb7af4f73c0a703b5842a708e94d80aea26b6db (diff) | |
Merge
Diffstat (limited to 'indra/newview/res/resource.h')
| -rw-r--r-- | indra/newview/res/resource.h | 4 |
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 |