Nyx Linden
|
438ceeb008
|
BUILDFIX: merge cleanup
A couple of merge issues that caused the resulting code to not build.
|
2013-01-25 17:58:11 -05:00 |
|
Nyx Linden
|
11fe124ae9
|
merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
|
2013-01-24 16:22:49 -05:00 |
|
Oz Linden
|
cebde0a32b
|
Added tag 3.4.5-beta3 for changeset e06898df8644
|
2013-01-23 11:43:16 -05:00 |
|
Oz Linden
|
5ed25940af
|
merge changes for DRTVWR-287
|
2013-01-22 16:42:56 -05:00 |
|
Oz Linden
|
2c58a49f23
|
tag merge of DRTVWR-287
|
2013-01-22 16:42:51 -05:00 |
|
Brad Payne (Vir Linden)
|
b40fad02de
|
Add debug level logging for Avatar by default. Will need to turn this off before general release, but will give us better debugging info during testing
|
2013-01-22 09:19:23 -05:00 |
|
Don Kjer
|
b13d0b7a65
|
Adding stub for private artifacts
|
2013-01-19 02:00:39 +00:00 |
|
Brad Payne (Vir Linden)
|
9a7c6a4ccc
|
merge
|
2013-01-18 16:53:25 -05:00 |
|
Brad Payne (Vir Linden)
|
b3cbe35532
|
SH-3344 WIP - more texture load monitoring
|
2013-01-18 16:51:03 -05:00 |
|
Don Kjer
|
06baa6bf9c
|
Moving appearance utility deb to private repo
|
2013-01-18 21:22:18 +00:00 |
|
Oz Linden
|
23336feed2
|
tag merge of DRTVWR-286
|
2013-01-18 12:51:16 -05:00 |
|
Kelly Washington
|
7ecfa28c43
|
MAINT-2247 Child object does not update rotation while selected.
|
2013-01-16 15:21:11 -08:00 |
|
Dave Parks
|
622d4f39a5
|
MAINT-2242 Fix for shader compilation errors on Intel HD graphics chips.
|
2013-01-16 15:20:32 -06:00 |
|
Brad Payne (Vir Linden)
|
31e1f3f7ef
|
merge
|
2013-01-16 14:48:19 -05:00 |
|
Brad Payne (Vir Linden)
|
6a8947679c
|
SH-3645 WIP - preserve item order after wearable save as
|
2013-01-16 11:34:42 -05:00 |
|
Brad Payne (Vir Linden)
|
f48011e4d0
|
SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump
|
2013-01-15 20:30:20 -05:00 |
|
prep
|
85e993224c
|
SH-3632:Undo change is now disabled after you save and return to the edit out fit panel (this behavior is now make sunshine-internal consistent with 3.4.1)
|
2013-01-14 17:21:13 -05:00 |
|
Brad Payne (Vir Linden)
|
6390188ff3
|
removed yet another logcontrol.xml commit
|
2013-01-14 16:02:28 -05:00 |
|
Oz Linden
|
c842494b77
|
Added tag 3.4.5-beta2 for changeset 6b9c7dbebef7
|
2013-01-14 10:43:57 -05:00 |
|
Oz Linden
|
2e4e3c91bb
|
merge changes for DRTVWR-283
|
2013-01-14 09:50:14 -05:00 |
|
Oz Linden
|
33d7784890
|
tag merge of DRTVWR-283
|
2013-01-14 09:50:09 -05:00 |
|
Oz Linden
|
9f21775788
|
merge changes for DRTVWR-281
|
2013-01-11 18:42:56 -05:00 |
|
Oz Linden
|
a9a4483df2
|
tag merge of DRTVWR-281
|
2013-01-11 18:39:25 -05:00 |
|
callum_linden
|
90fb925d84
|
fix line endings
|
2013-01-11 15:23:18 -08:00 |
|
Dave Parks
|
627e531d33
|
MAINT-417 Backed out changeset: 7273a1ac51e8
|
2013-01-11 17:17:13 -06:00 |
|
Brad Payne (Vir Linden)
|
0f753a530b
|
SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. Disabled inventory retries for now.
|
2013-01-11 11:36:11 -05:00 |
|
Brad Payne (Vir Linden)
|
6479e0a59b
|
merge
|
2013-01-11 11:22:24 -05:00 |
|
Oz Linden
|
33734be9f3
|
Added tag 3.4.5-beta1 for changeset 40a2265058ab
|
2013-01-10 21:04:33 -05:00 |
|
Oz Linden
|
fca9b86733
|
merge changes for DRTVWR-280
|
2013-01-10 16:56:06 -05:00 |
|
Oz Linden
|
c36d3ea291
|
tag merge of DRTVWR-280
|
2013-01-10 16:56:02 -05:00 |
|
Oz Linden
|
f3b362a6d4
|
merge changes for DRTVWR-279
|
2013-01-10 14:42:41 -05:00 |
|
Oz Linden
|
bc522d6ba2
|
tag merge of DRTVWR-279
|
2013-01-10 14:42:36 -05:00 |
|
Oz Linden
|
9c94cf4e59
|
pull back release tag for 3.4.4
|
2013-01-10 14:35:21 -05:00 |
|
Brad Payne (Vir Linden)
|
003e632680
|
merge
|
2013-01-10 13:24:18 -05:00 |
|
Brad Payne (Vir Linden)
|
5e7f36541b
|
SH-3639 WIP - increased retry interval to allow for intermittent extremely slow responses
|
2013-01-10 13:22:48 -05:00 |
|
Kelly Washington
|
4cbef6d928
|
MAINT-2209 Parcel name not updating after teleport
|
2013-01-10 09:46:41 -08:00 |
|
prep
|
008e078bf5
|
SH-3142: Added a debug option that circumvents the precache delay when teleporting.
|
2013-01-10 11:26:05 -05:00 |
|
Baker Linden
|
c4a1bd1c2f
|
viewer-development merge
|
2013-01-09 15:25:06 -08:00 |
|
Baker Linden
|
b0c449d301
|
[MAINT-2185] Unable to upload terrain .raw files
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
|
2013-01-09 15:24:27 -08:00 |
|
Oz Linden
|
d16757545c
|
Added tag 3.4.4-release for changeset e1bb1ae7d8b1
|
2013-01-09 18:19:24 -05:00 |
|
prep
|
547f48eabe
|
SH-3600. Undo change is disabled upon reentry into the appearance panel
|
2013-01-09 15:43:09 -05:00 |
|
Oz Linden
|
cdd45b9abb
|
merge changes for DRTVWR-276
|
2013-01-09 15:18:20 -05:00 |
|
Oz Linden
|
42a33b6c62
|
tag merge of DRTVWR-276
|
2013-01-09 15:18:10 -05:00 |
|
Dave Parks
|
4a84c7c8e5
|
More merge cleanup.
|
2013-01-09 13:20:41 -06:00 |
|
Dave Parks
|
971e9bd203
|
More merge cleanup.
|
2013-01-09 12:41:57 -06:00 |
|
Dave Parks
|
dda41e3458
|
Merge cleanup.
|
2013-01-09 12:08:31 -06:00 |
|
prep
|
1f17cac7e8
|
merge
|
2013-01-09 12:43:53 -05:00 |
|
prep
|
8e8765535f
|
SH-3620: Fix for editing a nocopy wearable being removed from the outfit
|
2013-01-09 12:41:51 -05:00 |
|
Oz Linden
|
bf55755262
|
merge changes for DRTVWR-277
|
2013-01-08 14:41:49 -05:00 |
|
Dave Parks
|
954ebaed84
|
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
|
2013-01-08 13:40:59 -06:00 |