diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
| commit | 4d22c32aa9ac42b4a720200386d68339e8656974 (patch) | |
| tree | c84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/newview/cursors_mac | |
| parent | 73e6711268adb93025386ffb766055125f0d849e (diff) | |
| parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) | |
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/newview/cursors_mac')
33 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif b/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif Binary files differindex a20893b1ee..a20893b1ee 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif b/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif Binary files differindex ab84bfbcc5..ab84bfbcc5 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif b/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif Binary files differindex 400ae42943..400ae42943 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif b/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif Binary files differindex 1cae801ee3..1cae801ee3 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_NO.tif b/indra/newview/cursors_mac/UI_CURSOR_NO.tif Binary files differindex bc4a7a75e2..bc4a7a75e2 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_NO.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_NO.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif b/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif Binary files differindex 62332fc956..62332fc956 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING.tif Binary files differindex ba6f30fa0e..ba6f30fa0e 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END.tif Binary files differindex 830d5692fd..830d5692fd 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END_ADD.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END_ADD.tif Binary files differindex e05284214a..e05284214a 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END_ADD.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_END_ADD.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START.tif Binary files differindex c4822adf64..c4822adf64 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START_ADD.tif b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START_ADD.tif Binary files differindex 5166af6e05..5166af6e05 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START_ADD.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_PATHFINDING_START_ADD.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif Binary files differindex de2c28bbbc..de2c28bbbc 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif Binary files differindex 2676c78a4f..2676c78a4f 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif Binary files differindex 33df3392f3..33df3392f3 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif b/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif Binary files differindex 8952054c23..8952054c23 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif Binary files differindex f366026c33..f366026c33 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif Binary files differindex bbf415a2f1..bbf415a2f1 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif Binary files differindex 2ab71c8af6..2ab71c8af6 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif Binary files differindex db4ca17de9..db4ca17de9 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif Binary files differindex 366630d6b2..366630d6b2 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif Binary files differindex ad5a9ca06d..ad5a9ca06d 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif Binary files differindex 7c0bcfcbc5..7c0bcfcbc5 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif Binary files differindex e9e6a20cd9..e9e6a20cd9 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif Binary files differindex 0a89f9bd91..0a89f9bd91 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif Binary files differindex 3431887aff..3431887aff 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif Binary files differindex 55317f19aa..55317f19aa 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif Binary files differindex 796bbb78e3..796bbb78e3 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif Binary files differindex 98881561cb..98881561cb 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif Binary files differindex 316dd38c69..316dd38c69 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif Binary files differindex bea3d9d442..bea3d9d442 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif Binary files differindex 0cd06379e8..0cd06379e8 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif b/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif Binary files differindex 65f3b6de28..65f3b6de28 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif diff --git a/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif b/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif Binary files differindex c49f16a1c4..c49f16a1c4 100644..100755 --- a/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif +++ b/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif |