ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
cf37c67764
Merge downstream code from viewer-bear
2013-04-30 10:02:05 -07:00
35f7a75083
Merge in downstream code from viewer-beta
2013-04-29 15:12:54 -07:00
5af5b49a62
Merge in downstream viewer-beta
2013-04-29 12:05:44 -07:00
bfb1ab134f
merge changes for 3.5.1-beta3
2013-04-23 14:29:24 -04:00
06d7845a5a
SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special characters.
...
Integrated Nicky Dasmijn's patch to handle the unicode file paths properly.
Code reviewed, patch was clean.
Tested locally, correctly allows wearables to load where they would fail before.
Should be ready for automated build & QA.
2013-04-22 19:14:24 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
ed2b5da8f1
merge changes for DRTVWR-298
2013-04-18 14:55:28 -04:00
490edf41eb
BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker
...
Added checks to validate that the selection list is non-empty
2013-04-17 19:20:42 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
a976f5c217
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
2013-03-25 12:19:02 -07:00
98a82c50d5
Pull in downstream CHUI code from viewer-development
2013-03-25 11:12:52 -07:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
e5aa9088f0
CHUI-810 : Merged Marine Kelley's patch on selected text and use of return key in chat
2013-03-11 14:59:53 -07:00
f061b2b90e
Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.
2013-03-08 15:31:37 -08:00
2e8b2558b4
For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936
2013-03-07 14:13:14 -08:00
2ea750ebca
For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.
2013-03-05 13:47:02 -08:00
93eaccae6f
Modify LLInstanceTracker to avoid using a map of strings to find a map of foo to find some pointers
2013-02-28 15:35:14 -08:00
010c87788d
Merge with HEAD
2013-02-15 10:15:58 -08:00
cc260a6356
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-02-14 12:16:37 -06:00
bc60d34f68
MAINT-2368 Pull in Firestorm fix for textures unloading behind you.
2013-02-14 12:15:59 -06:00
94ae64d6fd
Pull and merge viewer-release
2013-02-12 14:59:59 -08:00
bfffedaec9
Trivial whitespace change to ignite new Team City build after some admin work
2013-02-06 15:09:44 -08:00
5766592712
Updated contributions text file with people who worked on the FMOD upgrade patch
2013-02-06 13:57:51 -08:00
0908b60c1c
STORM-1930 Quality & Speed slider has Ultra label where High should be.
2013-02-01 08:10:16 +00:00
4de7c27d93
Merge in viewer-development
2013-01-14 09:31:57 -08:00
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
aa3a65f5aa
MAINT-2087 Cleanup XML changes from new preferences hash marks
2012-12-12 13:58:24 -06:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
2fd843c118
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
378e9528d4
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
9db74ae962
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
6c989a692d
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
185169cbbe
correct attribution for STORM-1868 (add Wolf Loonie)
2012-11-15 11:29:38 -05:00
695c4135ff
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
2012-09-07 14:47:24 -04:00
af6e665d5c
MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS X
2012-09-07 11:22:45 -05:00
43d29ea03e
merge changes for DRTVWR-202
2012-08-22 17:11:10 -04:00
0c903609d4
merge changes for storm-1895
2012-08-16 10:55:31 -04:00
39d79080c0
merge changes for storm-1899
2012-08-16 10:33:42 -04:00
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
08f35b6a14
STORM-1899: Avatar hand poses randomly get stuck in spread position
2012-07-26 17:07:12 +02:00
78854c9baa
Fix to build with code signing option (patch from STORM-1900)
2012-07-25 16:42:37 -07:00
764d1e3caf
merge up to 3.3.3-release
2012-06-28 10:35:22 -04:00
b4e1d03584
STORM-1895 - Rename Delay Restart button to Cancel Restart
2012-06-26 15:37:31 +01:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
e30fbb2837
merge changes for open-140
2012-06-19 12:36:47 -04:00
d1ac85a589
merge changes for open-142
2012-06-19 12:34:03 -04:00
simon