AndreyL ProductEngine
|
6f4d9a2321
|
MAINT-6424 Reverted disabling of the "Delete preset" button
|
2016-05-25 03:29:53 +03:00 |
|
Andrey Lihatskiy
|
238c1216c3
|
Merged in rider_linden/viewer-lynx (pull request #18)
MAINT-6403: Correct the local COF version from AIS when it loses sync.
|
2016-05-25 02:41:33 +03:00 |
|
Andrey Lihatskiy
|
00eda9e525
|
Merged in lindenlab/viewer-lynx-maint-6413 (pull request #16)
|
2016-05-25 02:40:48 +03:00 |
|
Glenn Glazer
|
650df5b2e9
|
merge from maint-6413 into lynx for pull request
|
2016-05-24 14:50:01 -07:00 |
|
Rider Linden
|
9ea13d49b7
|
Merge
|
2016-05-24 14:32:06 -07:00 |
|
Rider Linden
|
26b1c020c8
|
MAINT-6403: Updated a couple comments and dropped a couple warning levels back down to DEBUG.
|
2016-05-24 13:03:36 -07:00 |
|
Glenn Glazer
|
ce760e80c4
|
MAINT-6413: write summary.json from viewer_manifest.py, remove facility from cmake
|
2016-05-24 11:43:57 -07:00 |
|
Rider Linden
|
c7413e51b6
|
MAINT-6403: in the case of a version mismatch between the viewer's local accounting and the AIS reported. Override with the AIS version. simplify the appearance update code to account for new versioning. Fix spelling of descendant
|
2016-05-23 14:40:43 -07:00 |
|
Glenn Glazer
|
999a949b52
|
debug version args
|
2016-05-23 13:49:26 -07:00 |
|
Glenn Glazer
|
9c28c06f1d
|
backout 354346 / e63c00cf654a and 354347 / e4bfe3ee05a6
|
2016-05-23 12:08:59 -07:00 |
|
Glenn Glazer
|
8c45877871
|
backout 354345
|
2016-05-23 12:05:53 -07:00 |
|
Andrey Lihatskiy
|
380bbc01c9
|
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #42)
MAINT-6424 Disable the delete button for empty graphics presets list
|
2016-05-23 20:45:24 +03:00 |
|
AndreyL ProductEngine
|
8edfdc617d
|
MAINT-6424 Disable the delete button for empty graphics presets list
Fixed related notifications after improper merge as well
|
2016-05-23 02:23:03 +03:00 |
|
Ansariel
|
61a5c943ba
|
MAINT-6432 Fix defaults for RenderAvatarMaxComplexity
The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
|
2016-05-22 20:32:27 +02:00 |
|
AndreyL ProductEngine
|
602c9bc04a
|
MAINT-6317 Restored the fix after a conflict resolution
|
2016-05-20 02:12:26 +03:00 |
|
AndreyL ProductEngine
|
c50f96b492
|
Merged in lindenlab/viewer-lynx
|
2016-05-20 02:06:08 +03:00 |
|
AndreyL ProductEngine
|
b25a22a2c1
|
Merged in lindenlab/viewer-release
|
2016-05-19 23:02:37 +03:00 |
|
Rider Linden
|
213bcf6bb3
|
MAIN-6403: If a version mismatch occurs when requesting the COF, request a new appearance update from the simhost to update the viewer COF version.
|
2016-05-19 11:47:23 -07:00 |
|
Oz Linden
|
c2ef3b4c71
|
increment viewer version to 4.0.6
|
2016-05-19 10:25:05 -07:00 |
|
Oz Linden
|
ea08e23cf3
|
Added tag 4.0.5-release for changeset 450de775fff6
|
2016-05-19 10:24:24 -07:00 |
|
andreykproductengine
|
d3de134da0
|
MAINT-6409 invisiprims should be preloaded
|
2016-05-18 17:17:32 +03:00 |
|
Glenn Glazer
|
e8773a72cb
|
maint-6413: use configure_file instead of write(file ...)
|
2016-05-17 16:05:37 -07:00 |
|
Glenn Glazer
|
a382dcfb8d
|
maint-6413: use file write as printf inserts escape chars
|
2016-05-17 10:52:59 -07:00 |
|
andreykproductengine
|
e795fee864
|
MAINT-6409 texture_list xml file should be in cache.
|
2016-05-17 17:05:59 +03:00 |
|
Mnikolenko Productengine
|
191c2aec49
|
MAINT-6377 Nearby chat toasts cover the conversation floater.
|
2016-05-18 13:15:01 +03:00 |
|
Glenn Glazer
|
58e9a59199
|
fix for maint-6413: add channel to summary.json
|
2016-05-16 14:49:40 -07:00 |
|
andreykproductengine
|
e3afb1fdba
|
MAINT-5935 server timestamp
|
2016-05-16 17:50:09 +03:00 |
|
andreykproductengine
|
b756b47d08
|
MAINT-6383 SLT timestamp in "About second life" floater
|
2016-05-13 19:42:27 +03:00 |
|
Mnikolenko Productengine
|
8243301b3f
|
MAINT-6408 FIXED viewer should allow password field entry greater than 16 bytes
|
2016-05-13 14:16:46 +03:00 |
|
Mnikolenko Productengine
|
87ca1fc3d9
|
MAINT-6400 Make the region "Object Bonus" setting safer
|
2016-05-13 13:33:14 +03:00 |
|
andreykproductengine
|
5048402da8
|
MAINT-5786 FIXED Redundant sibling index suffix on uploaded mesh object names.
|
2016-05-12 17:46:20 +03:00 |
|
andreykproductengine
|
54bbf95f26
|
MAINT-5635 PSYS_SRC_MAX_AGE breaks when replacing a particle system without it
|
2016-05-11 18:33:50 +03:00 |
|
Andrey Kleshchev
|
80573b362c
|
Merged in MAINT-6370
|
2016-05-10 20:39:11 +03:00 |
|
Ansariel
|
709c15dc23
|
Display correct attempt for requesting region capabilities at startup
|
2016-05-10 19:35:41 +02:00 |
|
andreykproductengine
|
d37003a631
|
MAINT-2129 signuls cleanup
|
2016-05-23 18:06:16 +03:00 |
|
andreykproductengine
|
efa716b5fc
|
MAINT-2129 "Block" button doesn't become disabled
|
2016-05-18 19:29:31 +03:00 |
|
Mnikolenko Productengine
|
9ffc67ef84
|
MAINT-2583 Minimized floaters cannot brought back to foreground anymore
|
2016-05-23 12:25:27 +03:00 |
|
Mnikolenko Productengine
|
3d68b80bd3
|
MAINT-1057 Allow to close build floater via Build menu
|
2016-05-20 16:55:46 +03:00 |
|
Oz Linden
|
94c667c9ab
|
merge changes for MAINT-6392
|
2016-05-10 12:05:21 -04:00 |
|
Rider Linden
|
5fdc540e57
|
MAINT-6392: Do not change the URL used for getting cookies (except to pass it to CEF) The original URL is used for HTTP Core access to profile functionality.
|
2016-05-09 14:20:21 -07:00 |
|
Oz Linden
|
39a0d18e39
|
gratuitous change for new ticket number
|
2016-05-07 08:29:36 -04:00 |
|
AndreyL ProductEngine
|
ffbbc30d1a
|
Merged in lindenlab/viewer-lynx
|
2016-05-06 23:26:24 +03:00 |
|
AndreyL ProductEngine
|
f47b0b146e
|
Merged in oz_linden/maint-5974
|
2016-05-06 23:23:21 +03:00 |
|
Andrey Lihatskiy
|
8e91c90ca3
|
Merged in andreyl_productengine/viewer-lion-marchcat (pull request #37)
MAINT-6376 Disable loading surface textures in the wireframe mode
|
2016-05-06 19:55:46 +03:00 |
|
Oz Linden
|
950c41d184
|
merge 4.0.4-release and MAINT-5974
|
2016-05-06 10:28:42 -04:00 |
|
AndreyL ProductEngine
|
7c09c64878
|
Merged in lindenlab/viewer-bear
|
2016-05-06 17:26:35 +03:00 |
|
Oz Linden
|
7f5e6cea12
|
fix cmake warning by conditionalizing dependency that does not exist on Macs
|
2016-05-06 09:19:12 -04:00 |
|
Oz Linden
|
a07a8cbf6e
|
merge changes for 4.0.4-release
|
2016-05-06 09:05:51 -04:00 |
|
Oz Linden
|
94559950a2
|
increment viewer version to 4.0.5
|
2016-05-06 08:56:31 -04:00 |
|
Oz Linden
|
1114d681f1
|
Added tag 4.0.4-release for changeset 0a5de9ec2cb8
|
2016-05-06 08:56:31 -04:00 |