0755cb098d
Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.
...
Two fairly simple conflicts: dead stats sending code in the
texture fetch code (new llcorehttp library) and the cleanup
code in llappviewer was moved around in 3.4.x.
2012-11-07 13:28:42 -05:00
1709952adb
pull back 3.4.1-beta6 fixes
2012-10-10 21:40:10 -04:00
04e8d074b2
DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code.
...
This was yet another refresh from v-d because of significant changes
to lltexturefetch that would not have been resolvable by casual
application of any merge tool. There are still a few questions
outstanding but this is the initial, optimistic merge.
2012-09-07 12:53:07 -04:00
43d29ea03e
merge changes for DRTVWR-202
2012-08-22 17:11:10 -04:00
efdcf045b0
Merged in from viewer-development.
2012-08-17 08:07:15 -07:00
a7d8b42509
merge up to latest viewer-development
2012-08-16 08:52:26 -04:00
b9e43dfd64
merge back beta fixes
2012-08-15 20:09:41 -04:00
f4fb073ae0
open-146: correct licenses in llphysicsextensions stub
2012-08-14 18:30:11 -04:00
fdb2ae8335
Merge of viewer-development (3.4.1).
2012-08-03 11:57:51 -04:00
4ed9dfd47b
Fixing up the string in the code sign flag.
2012-08-01 16:25:56 -07:00
27d5547478
Added necessary signing information to autobuild.xml
2012-08-01 12:56:51 -07:00
df93749819
merge up to latest viewer-development
2012-07-31 14:55:15 -04:00
58d5e223b8
merge
2012-07-30 15:02:02 -04:00
a5c9d89b28
merge
2012-07-30 14:57:33 -04:00
0cd08985b3
MAINT-1056 FIX Microsoft SkyDrive is not compatible with Second Life
...
Reviewed by YP
2012-07-27 13:35:00 -07:00
01b7959e01
update to latest builds of llphysicsextensionss
2012-07-25 12:31:16 -04:00
ef37311e9e
merge up to latest viewer-pathfinding (including 3.3.4)
2012-07-24 13:11:14 -04:00
4feef5af63
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-07-23 19:21:34 -07:00
12b1ec6264
refactor to build llphysicsextensions_tpv package for sublicensees
2012-07-20 07:38:12 -07:00
0e592855eb
Updating to the latest llphysicsextension source package.
2012-07-17 19:06:35 -07:00
a34c1e9a0c
update the llphysicsextensions stub package to match the source package
2012-07-12 08:59:07 -04:00
713aa9f25d
Updating to latest llphysicsextensions build. This should remove the dependency on cmake 2.8.2 for Linux.
2012-07-11 22:50:45 +00:00
deee0222bd
use the Linden Libraries builds for llphysicsextensions, with cmake fix for linux
2012-07-11 11:15:16 -04:00
f4b0b9d8fd
apply latest builds with fixes from falcon
2012-07-11 10:35:34 -04:00
9f455c3cb5
Fixing md5sum for linux 3p-havok-source dependency.
2012-07-11 03:54:31 +00:00
9fa98e13eb
Hopefully fixed windows build. Now support -DLL_DEBUG_HAVOK:BOOL=ON to enable Havok Hyrbid (fulldebug) libs to link in Windows RelWithDebInfo. On other platforms, that flag will cause RelWithDebInfo to link against Havok fulldebug libs. The rest of the time, RelWithDebInfo will link to Havok Debug and Debug will link to Havok Fulldebug
2012-07-11 03:16:33 +00:00
14acd7de30
experimental change for windows debug build
2012-07-10 17:44:55 -04:00
1c3af2658e
SH-3192 Fix Boost 1.48.0 libraries to support Debug builds on Windows.
...
Tweaked the boost source as per Boost issue #6185 using 1.49.0 sources
and this picks up the new build. Debug viewer builds and runs.
2012-07-10 13:29:24 -04:00
e2dffdb38e
update llphysicsextension-source build to address linux build issue
2012-07-09 17:52:53 -04:00
9c4d1c7791
changes to build real sources (works locally on a Mac)
2012-07-09 12:57:18 -04:00
92fb006835
update llphysicsextensions source and stub packages
2012-07-05 12:16:02 -04:00
21ee5f8d41
successful build with llphysicsextensions stub
2012-07-05 09:39:21 -04:00
1cad2d9de2
update to 20120702 build of havok
2012-07-05 06:33:47 -04:00
14f754f160
begin integrating building of llphysicsextensions from source here (incomplete)
2012-07-05 06:08:34 -04:00
8e5197a71b
Merge 3.3.3 release with Drano HTTP library at 3.3.0
...
Big delta was converting the new texture debugger support code
to the new library. Viewer manifest should probably get an eyeball
before release.
2012-07-02 18:06:22 -04:00
764d1e3caf
merge up to 3.3.3-release
2012-06-28 10:35:22 -04:00
df40282058
Updating to the latest pre-build llphysicsextensions package.
2012-06-27 18:38:06 -07:00
fa562d19cf
Removing unreferenced methods from the LLRenderNavPrim class.
2012-06-27 18:12:57 -07:00
74d4f8af01
v-r to drano merge conflicts wip
2012-06-26 16:43:58 -04:00
ce10117295
PATH-718: Ensuring that the characters panel will work correctly with a stubbed physicsextension library.
2012-06-25 18:02:41 -07:00
11d5ed7ab2
Updating the latest llphysicsextensions pre-built package.
2012-06-22 19:22:15 -07:00
6e710333e7
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-06-22 18:59:31 -07:00
4397516ca5
merge changes for DRTVWR-168
2012-06-21 17:50:41 -04:00
71511a84ee
Updating to the latest physics extensions pre-built package.
2012-06-20 13:01:15 -07:00
84536935eb
MAINT-1144: Update with relevant apr_suite fix.
2012-06-18 16:14:30 -04:00
667ca78b49
MAINT-1144: Update to apr_suite containing relevant fix.
2012-06-18 12:57:55 -04:00
583855f3e6
Update to latest llphysics extension for path-740 fix.
2012-06-18 12:27:13 -04:00
185db4ad38
switch to (identical) library builds from lindenlab repositories
2012-06-16 08:42:13 -04:00
76abab0618
When using OS autobuild config switches, set build configuration in VS to specified type (release, relwithdebinfo, or debug)
...
Also, set startup project to SecondLife-bin
2012-06-11 13:19:15 -07:00
1bfdfcb7b9
Merge pull from vir/drano
2012-06-08 18:58:35 -07:00
Monty Brandenberg