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.

4 files changed, 2 insertions, 0 deletions

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
diff --git a/indra/newview/res/toolmediaopen.cur b/indra/newview/res/toolmediaopen.cur
new file mode 100644
index 0000000000..7609989ba7
--- /dev/null
+++ b/indra/newview/res/toolmediaopen.cur
diff --git a/indra/newview/res/toolpause.cur b/indra/newview/res/toolpause.cur
new file mode 100644
index 0000000000..7a6e85566b
--- /dev/null
+++ b/indra/newview/res/toolpause.cur
diff --git a/indra/newview/res/toolplay.cur b/indra/newview/res/toolplay.cur
new file mode 100644
index 0000000000..0776a17bbc
--- /dev/null
+++ b/indra/newview/res/toolplay.cur