dcc57bbb0e
merge changes for eli2_viewer-development
2011-07-21 09:30:22 -04:00
91bc7e34cf
merge late beta fixes
2011-07-21 09:25:46 -04:00
09c18af318
merge changes for release tags
2011-07-21 09:25:08 -04:00
f14a417d48
Merged with default tip (Revision d8c37b383028)
...
--HG--
branch : Viewer-Build
2011-07-21 12:41:06 +02:00
aaecc4c53c
SH-2020 Fix for avatar skin/eyes and trees being bright/black/busted underwater.
2011-07-21 00:42:48 -05:00
e52caca712
SH-2048 Fix for invisiprims infecting neighboring prims with their invisi-ness.
2011-07-20 23:50:44 -05:00
95da8c81f3
Automated merge with http://hg.secondlife.com/viewer-development
2011-07-20 20:18:12 -07:00
fecf706f1b
EXP-880 FIX Enable navigation chrome for Search floater
...
changes in size of target windows other than _blank or "" are not saved
EXP-1018 FIX Profile button in Basic mode does not toggle correctly when profile is opened and toggles on and closes other Web Content Panel windows
2011-07-20 20:16:47 -07:00
7d9fff968d
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
2011-07-20 18:54:50 -07:00
f6ed8bfea6
fix for crash when adding new fast timers
2011-07-20 18:46:34 -07:00
85370eed51
Updating autobuild.xml with patches for ares, curl, llqtwebkit and openssl to propagate the earlier changes
...
to ares and openssl that never made it into the viewer.
Reviewed by Richard.
2011-07-20 17:07:10 -07:00
78f1bad0e6
SH-2021 Fix for black water at the horizon from occlusion culling madness.
2011-07-20 17:56:22 -05:00
d7104eac39
merge
2011-07-20 14:16:24 -07:00
45c48f7cd3
EXP-937 JavaScript can be turned off in the viewer which will break intro screen - investigate options
2011-07-20 14:14:59 -07:00
26568d5c98
SH-1838 Add error handling for allocation of off screen render targets.
...
Reviewed by Leslie
2011-07-20 16:06:04 -05:00
cec8d8b3e6
FIX INTL-58 set25, light set4 translation for 6 languages
2011-07-20 13:56:21 -07:00
c567f0dcdd
Added tag DRTVWR-68_2.7.5-release, 2.7.5-release for changeset 6866d9df6efb
2011-07-20 16:43:32 -04:00
6d86a36b84
Re-indent teamcity service messages when scanning build logs to fix incredibuild formatting.
2011-07-20 11:48:57 -07:00
299615e9d6
Re-enable public build status indicators
2011-07-20 11:48:19 -07:00
5b89ba6942
Removed unused variable for build fix.
2011-07-20 11:35:38 -07:00
0ddf718d92
still trying to fix channels
2011-07-20 13:48:46 -04:00
956021b866
Disabling freshness tag for the merge.
2011-07-20 10:37:25 -07:00
7d8ec74213
Switching channels to project viewer
2011-07-20 11:30:55 -04:00
78fcbfec68
Merged with default tip (Revision a48ab7917877)
...
--HG--
branch : Viewer-Build
2011-07-20 11:43:01 +02:00
15f98992fa
merge
2011-07-19 17:26:12 -07:00
9b1174243d
EXP-932 Implement system that fades from login page to (either) intro screen or loading screen instead of using a hard cut
...
EXP-938 Turn off in-world audio until fade from intro/loading page complete
EXP-939 Fade from intro/loading page to world, not to image of last login
2011-07-19 17:25:02 -07:00
11ddfa8bce
SH-2090 FIX - cherry pick from davep commit
2011-07-19 17:52:32 -04:00
76249c58f6
SH-2038 FIX -- [PUBLIC] Severe performance drop on MacBook Pros
...
EXP-997 FIX -- Significant FPS degradation in 2.8.0 Beta on Mac equipped ATI video card
* Disabled VBO's on mac to avoid stalls in renderer
* Placed valid data into the padding between triangles in the vertex buffer to remove uninitialized craziness
* Removed invalid rendering checks causing GL errors in debug mode
Reviewed by davep
2011-07-19 13:31:32 -07:00
f45747e524
merge changes for storm-1487
2011-07-19 15:45:31 -04:00
20e08f6aa7
merge changes for storm-1221
2011-07-19 15:45:15 -04:00
41890cfee8
merge changes for storm-1502
2011-07-19 15:44:19 -04:00
51f251b2d5
merge changes for storm-1503
2011-07-19 15:44:00 -04:00
181c34c984
merge changes for vwr-26066
2011-07-19 15:43:38 -04:00
aebeac6898
merge changes for storm-1476
2011-07-19 15:43:12 -04:00
564087f6b0
addendum to prim fix
2011-07-19 15:33:43 -04:00
8b7e33ad36
Cherry pick of https://bitbucket.org/lindenlab/mesh-development/changeset/9cea44ebea3b by don, to fix old viewer crashes in mesh regions
2011-07-19 15:19:07 -04:00
880a7ebb92
STORM-519 FIXED "Delete" is enabled in the context menu for folders which contain worn items
...
- Disable "Delete" menu item in case selected folder contains non-removable items.
2011-07-19 21:24:56 +03:00
563c942a34
STORM-1487 FIXED Changed the "get more gestures" marketplace URL.
2011-07-19 21:21:11 +03:00
cf8c7701df
STORM-1221 FIXED Hard coded dates made localizable under Group Profile Land/Assets.
...
Added a function for parsing a date string of specific format.
Added strings defining the date format in Group Profile Land/Assets that should be localized.
2011-07-19 20:04:24 +03:00
25ababd7a6
More FormatMessage compile errors, try again to fix
2011-07-19 10:40:02 -04:00
5379467ccb
Fix copy/paste error in swiped FormatMessage() example code.
2011-07-19 10:18:12 -04:00
8b8fdd0bdd
merge
2011-07-19 09:59:03 -04:00
677609b722
Per Josh's comments in http://codereview.lindenlab.com/6510035/
...
Instead of low-level open(O_CREAT | O_EXCL) loop on all platforms, use
GetTempFileName() on Windows and mkstemp() elsewhere.
Don't append a final newline to NamedTempFile: use caller's data literally.
Tweak a couple comments.
2011-07-19 09:05:54 -04:00
3ce04f335e
SH-1904 FIX (cherry pick from original by bao)
2011-07-18 18:25:47 -04:00
808521393c
sync with viewer-development
2011-07-18 15:01:41 -07:00
4dc0850da7
merge changes for storm-1515
2011-07-18 15:41:14 -04:00
4adb212438
merge changes for storm-1517
2011-07-18 15:40:35 -04:00
24524bee42
merge changes for storm-1516
2011-07-18 15:39:58 -04:00
9e3c1f59d9
merge changes for storm-1510
2011-07-18 15:38:25 -04:00
26a76757f6
merge changes for beta branch tag
2011-07-18 15:37:29 -04:00
Oz Linden