Loren Shih
293b35f000
Automated merge from mesh-development
2011-02-01 11:16:43 -05:00
Dave Parks
ee39db49a3
SH-831 Fix for local lights option not disabling local lights.
2011-02-01 03:13:47 -06:00
Dave Parks
16f0386610
merge
2011-02-01 02:33:32 -06:00
Dave Parks
1a51db5b53
SH-641 Cosmetic fix -- keep showing last rendered mesh LoD if requested LoD is unavailable.
2011-02-01 02:33:14 -06:00
Brad Payne (Vir Linden)
b2b4370e34
merge
2011-01-31 18:04:01 -05:00
Brad Payne (Vir Linden)
7205ad6d53
SH-872 WIP - temporarily disabling problematic log output to see if that fixes crash on test machine
2011-01-31 18:03:39 -05:00
prep
09bfb95976
Fix for Sh-512: Scales use their previous maximum value
2011-01-31 16:23:22 -05:00
Xiaohong Bao
fe253e6ec6
merge the changeset 4de3178c6c81 from viewer-development: fixed the major memory leaking for SH-723/SH-847: memoy leaking
2011-01-28 21:43:28 -07:00
Roxie Linden
403b509f3a
automated merge
2011-01-28 17:02:32 -08:00
leyla_linden
fc4a36c630
Merge
2011-01-28 16:44:50 -08:00
leyla_linden
fefc37e92f
SH-808 making sure the 10m vs. 64m scale limit switch happens for both the spinner and the manipulation tools etc.
2011-01-28 16:39:02 -08:00
Roxie Linden
159afd141d
SH-753 - Ghost meshes
...
Fix the case where the silhouette shown when editing a mesh in an adjacent region
was showing up in the wrong place. The silhouette was not being translated
by the avs view with respect to the region.
2011-01-28 16:37:27 -08:00
Brad Payne (Vir Linden)
435e9de7f1
merge
2011-01-28 17:42:30 -05:00
Brad Payne (Vir Linden)
c285dddcca
SH-845 FIX - display a message before bailing out if CPU lacks SSE2 support
2011-01-28 17:42:02 -05:00
leyla_linden
ad54a46ba2
SH-841 Hide physics parameters in build tools when connected to a region that doesn't support additional physics parameters.
2011-01-28 12:22:51 -08:00
leyla_linden
ba8fcdcd19
SH-887 Upload model options available when MeshEnabled set to False
2011-01-28 12:17:00 -08:00
prep linden
9c58022a2e
Renamed function
2011-01-27 17:17:17 -05:00
prep linden
536b51c2bb
Renamed function
2011-01-27 17:15:31 -05:00
prep linden
2e8640c3b0
Optimization so that updateRiggedAttachments is not called every frame - still a WIP.
2011-01-27 17:13:08 -05:00
prep linden
1b97777f1a
Rebuild attached rigs during attachObject
2011-01-27 16:12:13 -05:00
leyla_linden
1a2ad23282
Merge
2011-01-26 17:03:26 -08:00
leyla_linden
f89b8c2685
SH-841 Hide physics parameters in build tools when connected
2011-01-26 17:02:11 -08:00
leyla_linden
ae292e00bb
SH-842 Hide "Model" option in upload menu
2011-01-26 17:01:56 -08:00
Dave Parks
f0be01bda9
SH-641 Fix for some objects not properly switching LoD under some situations.
...
Fix for redundant calls to stateSort(LLDrawable*...)
Put back "Build Queue" info display.
2011-01-26 15:26:56 -06:00
Dave Parks
96c6200f72
SH-390 Fix for bad occlusion culling of some mesh objects.
2011-01-25 15:29:45 -06:00
Dave Parks
ec1aa95a4b
merge
2011-01-25 14:33:04 -06:00
Roxie Linden
92018853e2
SH-753 GHOST Mesh from a Mesh Sandbox 11 and 12 from 6
...
Raycast debug view was not translating by the agent origin
2011-01-24 16:58:10 -08:00
Loren Shih
d0cba9e919
Automated merge up from viewer-development into mesh-development
2011-01-24 10:56:40 -05:00
Dave Parks
dc918c66d1
SH-704 Potential fix for crash in LLModelPreview::calcResourceCost.
2011-01-21 18:26:22 -06:00
Dave Parks
d7db673dc7
Fix for leaking occlusion queries -- try not to hold onto so many stale occlusion query references.
2011-01-21 18:25:57 -06:00
Dave Parks
4fefb98cba
merge
2011-01-21 16:24:31 -06:00
Dave Parks
3c053b3fdb
SH-534 Fix for various bump map glitches.
2011-01-21 16:23:44 -06:00
Oz Linden
7a453b7c93
add missing entry in contributions.txt for VWR-24347
2011-01-21 16:20:29 -05:00
Aleric Inglewood
ee6a40beb1
VWR-24519: make debugging easier by not spawning spare process
2011-01-21 16:02:38 -05:00
Oz Linden
d034d8d928
merge changes for vwr-24347
2011-01-21 15:55:55 -05:00
Aleric Inglewood
97a9211d87
VWR-24354: correct manifest dependencies to prevent parallel install problem
2011-01-21 15:48:12 -05:00
Oz Linden
790dfe7556
merge changes for storm-844
2011-01-21 15:29:40 -05:00
Oz Linden
4652e26196
merge changes for storm-869
2011-01-21 15:14:39 -05:00
Oz Linden
2d6228b4e0
merge changes for storm-874/ER-428: fix lost movement updates when walking
2011-01-21 15:11:20 -05:00
Roxie Linden
4eb6d5502c
automated merge
2011-01-21 11:08:25 -08:00
Loren Shih
b94ddeaa46
SH-823 Admin menu does not appear when in god mode
...
Fixed this issue. Also, viewer-development has a duplicated "Region Debug Console" entry. I assume this duplication is a mistake / bad merge so I took out the duplicate.
2011-01-21 13:29:17 -05:00
Loren Shih
38f4bad925
Automated merge up from viewer-development
2011-01-21 10:36:29 -05:00
Oz Linden
bb3be2c07f
merge changes for storm-715
2011-01-21 07:23:48 -05:00
Oz Linden
bca2b9a053
merge changes for storm-832
2011-01-21 07:22:37 -05:00
Oz Linden
a426a4b65b
merge changes for storm-834
2011-01-21 07:21:51 -05:00
Oz Linden
3015e43105
merge changes for storm-484
2011-01-21 07:20:54 -05:00
Oz Linden
5f997751fe
merge changes for storm-383
2011-01-21 07:20:18 -05:00
Oz Linden
4f3953763d
merge changes from viewer-beta
2011-01-20 20:48:16 -05:00
Roxie Linden
ee66cb8627
remove duplicates
2011-01-20 15:15:28 -08:00
Roxie Linden
15942dee9b
automated merge
2011-01-20 14:51:36 -08:00