1273dbfdd9
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2012-12-05 17:09:38 -07:00
aeef6cba02
fix fo SH-3151: Some textures not in view load when avatar sits down.
2012-12-05 17:06:08 -07:00
1f228c2228
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2012-12-05 17:40:29 -06:00
1ab00f6cd3
MAINT-2040 Fix for rigged meshes sometimes not updating properly with color changes.
2012-12-05 17:39:50 -06:00
57db08d792
Fix merge breakage
2012-12-04 17:45:19 -08:00
7fe4fbe674
Pull in upstream viewer-development via viewer-lion
2012-12-04 15:03:34 -08:00
40e78a80cc
Pull and merge viewer-development
2012-12-04 14:31:15 -08:00
fddd386804
Pull back upstream fixes from viewer-lion
2012-12-04 10:52:26 -08:00
e3b5d8b24f
more for MAINT-1955: Viewer crashes while login after clearing cache
2012-12-03 21:34:36 -07:00
28d8aade82
MAINT-1748 Users have an ability to sell non existing objects from content of other object
...
* Keep the buy-contents floater subscribed to inventory changes on the object.
reviewed with Simon
2012-12-03 13:18:46 -08:00
06a5cc5285
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2012-11-30 17:03:48 -06:00
e83700b56d
MAINT-1991 Attempt to mitigate crashes in GL drivers by encouraging people to update their drivers.
...
Reviewed by Simon
2012-11-30 17:03:12 -06:00
f5a47417fd
merge changes for DRTVWR-230
2012-11-27 10:53:50 -05:00
f8a182ec37
tag merge of DRTVWR-230
2012-11-27 10:53:17 -05:00
8d07be9775
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2012-11-26 17:28:17 -07:00
fe2f9e12f7
fix for MAINT-1955: Viewer crashes while login after clearing cache
2012-11-26 17:27:25 -07:00
3df1e46588
MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering enabled.
...
Reviewed by VoidPointer
2012-11-26 17:10:22 -06:00
e81a345340
MAINT-1953 Add NVIDIA GT 230 to gpu table
2012-11-26 14:02:32 -06:00
4aa818055e
MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel
...
Reviewed by Simon
2012-11-26 13:22:25 -06:00
c57a40da17
merge changes for DRTVWR-249
2012-11-26 12:40:54 -05:00
5a4b22e96b
tag merge of DRTVWR-249
2012-11-26 12:40:44 -05:00
0820124bee
MAINT-1950 Fix for offscreen objects not getting rebuilt sometimes.
2012-11-21 16:15:35 -06:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
18e20ca6f2
MAINT-1270 Fix for flexi prims showing up as discs when first loading.
...
Reviewed by Stinson.
2012-11-20 16:50:23 -06:00
8db983fb80
MAINT-1270 Fix for flexi prims showing up as discs when first loading.
...
Reviewed by Stinson.
2012-11-20 16:50:23 -06:00
a830812172
merge changes for DRTVWR-247
2012-11-20 15:37:54 -05:00
903b68a3ec
tag merge of DRTVWR-247
2012-11-20 15:37:45 -05:00
557293137c
Automated merge with http://hg.secondlife.com/viewer-development
2012-11-20 14:46:24 -05:00
7ab282a09c
merge changes for DRTVWR-246
2012-11-20 11:30:31 -05:00
03cff74fb6
tag merge of DRTVWR-246
2012-11-20 11:23:24 -05:00
8b65c37250
merge changes for DRTVWR-229
2012-11-20 09:45:20 -05:00
ad527e8b1e
tag merge of DRTVWR-229
2012-11-20 09:45:14 -05:00
f5b4a0af64
MAINT-1841 Fix for mac/linux build
2012-11-19 18:30:13 -06:00
c4c5d3c9d3
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.
2012-11-19 16:27:14 -08:00
7709b76469
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2012-11-19 17:41:30 -06:00
7491fbd677
MAINT-1841 Use NVAPI to force NVIDIA GPU power management mode to prefer max performance
...
Reviewed by Simon.
2012-11-19 17:40:43 -06:00
62301cb883
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-19 12:01:51 -08:00
2d1a903d39
increment version to 3.4.4
2012-11-19 14:54:52 -05:00
b2f81f7900
merge tag for 3.4.2-release
2012-11-19 14:53:28 -05:00
d56a98dea4
Added tag 3.4.2-release for changeset 16310aabccf3
2012-11-19 14:51:03 -05:00
cca22d608d
Added tag 3.4.3-beta1 for changeset 94ab2b49458a
2012-11-19 14:41:24 -05:00
f50b58a11b
Pull and merge from https://bitbucket.org/lindenlab/viewer-development .
2012-11-19 11:24:57 -08:00
f362666df7
merge changes for DRTVWR-245
2012-11-19 11:31:01 -05:00
6cd16bc537
tag merge of DRTVWR-245
2012-11-19 11:28:52 -05:00
f99d7bcd47
Added tag DRTVWR-232 for changeset f1d3b3fcab28
2012-11-19 11:25:08 -05:00
e66dacddfd
Update to Boost 1.52 package with gcc 4.1 warning fix.
2012-11-17 11:17:57 -05:00
6036ee9c42
MAINT-1890 FIX Removing previous hacky fix for this issue. The better solution is to clamp the update_period to a reasonable number of frames (32).
2012-11-16 17:26:01 -08:00
ace013d26c
MAINT-1942 Increase maximum animation length from 30 seconds to 60 seconds
...
reviewed with Simon
2012-11-16 16:22:17 -08:00
aaf96507a1
Some Mac header #defines macros like check and equivalent -- gack!!
...
Given that third-party libraries (such as Boost) can and do use those names,
properly namespace-scoped, it's unpardonable to break any such innocent usage
with a macro. Given the pervasiveness of the need, introduce a header file
with the requisite #undef directives.
2012-11-16 18:08:40 -05:00
4d1b62f46b
Certain test and example programs now need the Boost.System library.
2012-11-16 18:04:07 -05:00
Xiaohong Bao