From 98fd90ddd6595f2ee7e626c14117f51def621ec5 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Thu, 14 Feb 2008 01:45:59 +0000 Subject: svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parcel_media/sl-parcelmedia-6 --> release QAR-275 Parcel Media Sam made me do it. --- indra/newview/res/resource.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/res/resource.h') diff --git a/indra/newview/res/resource.h b/indra/newview/res/resource.h index 2a6a113cb9..4f2e88f7f2 100644 --- a/indra/newview/res/resource.h +++ b/indra/newview/res/resource.h @@ -50,6 +50,7 @@ #define IDC_CURSOR4 153 #define IDC_CURSOR5 154 #define IDI_LCD_LL_ICON 157 +#define IDC_CURSOR6 158 #define IDC_RADIO_56 1000 #define IDC_RADIO_128 1001 #define IDC_RADIO_256 1002 @@ -182,6 +183,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 159 #define _APS_NEXT_RESOURCE_VALUE 167 #define _APS_NEXT_COMMAND_VALUE 40002 #define _APS_NEXT_CONTROL_VALUE 1139 -- cgit v1.2.3