diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:22:42 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-15 10:22:42 +0100 |
| commit | 10905a7ed1d650c63f596d0e4511494864b68cd3 (patch) | |
| tree | b8a5fa798a8907669832b4cedad682804b6db08b /indra/newview/res | |
| parent | 1497a375535e4a79a876af58b9a3f6f3651ba55b (diff) | |
| parent | fcb36144dd78d0fa9cacc6fd6e036846493ea2a2 (diff) | |
merge from viewer-hotfix
Diffstat (limited to 'indra/newview/res')
| -rw-r--r-- | indra/newview/res/resource.h | 4 | ||||
| -rw-r--r-- | indra/newview/res/toolbuy.cur | bin | 0 -> 4286 bytes | |||
| -rw-r--r-- | indra/newview/res/toolopen.cur | bin | 0 -> 4286 bytes | |||
| -rw-r--r-- | indra/newview/res/toolsit.cur | bin | 0 -> 4286 bytes | |||
| -rw-r--r-- | indra/newview/res/viewerRes.rc | 3 |
5 files changed, 4 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 diff --git a/indra/newview/res/toolbuy.cur b/indra/newview/res/toolbuy.cur Binary files differnew file mode 100644 index 0000000000..a1bc278116 --- /dev/null +++ b/indra/newview/res/toolbuy.cur diff --git a/indra/newview/res/toolopen.cur b/indra/newview/res/toolopen.cur Binary files differnew file mode 100644 index 0000000000..a72cdfe4c0 --- /dev/null +++ b/indra/newview/res/toolopen.cur diff --git a/indra/newview/res/toolsit.cur b/indra/newview/res/toolsit.cur Binary files differnew file mode 100644 index 0000000000..6327bdb281 --- /dev/null +++ b/indra/newview/res/toolsit.cur diff --git a/indra/newview/res/viewerRes.rc b/indra/newview/res/viewerRes.rc index 6a1c1cb377..12a09392f6 100644 --- a/indra/newview/res/viewerRes.rc +++ b/indra/newview/res/viewerRes.rc @@ -119,6 +119,9 @@ TOOLPIPETTE CURSOR "toolpipette.cur" TOOLPLAY CURSOR "toolplay.cur" TOOLPAUSE CURSOR "toolpause.cur" TOOLMEDIAOPEN CURSOR "toolmediaopen.cur" +TOOLBUY CURSOR "toolbuy.cur" +TOOLOPEN CURSOR "toolopen.cur" +TOOLSIT CURSOR "toolsit.cur" ///////////////////////////////////////////////////////////////////////////// // |