7662e5d4ac
SH-512: Inworld scale weights use previous maximum (10)
2011-02-01 14:59:05 -05:00
c7d0fab7b9
Fixes for merge up from viewer-development to mesh-development.
...
Backed out SH-659 since merge was messy; this will be merged in manually later.
2011-02-01 12:33:39 -05:00
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
293b35f000
Automated merge from mesh-development
2011-02-01 11:16:43 -05:00
f0074f1002
merge changes back from beta branch
2011-02-01 07:22:32 -05:00
ee39db49a3
SH-831 Fix for local lights option not disabling local lights.
2011-02-01 03:13:47 -06:00
16f0386610
merge
2011-02-01 02:33:32 -06:00
1a51db5b53
SH-641 Cosmetic fix -- keep showing last rendered mesh LoD if requested LoD is unavailable.
2011-02-01 02:33:14 -06:00
1aa01ad67f
Merge
2011-01-31 19:29:18 -05:00
c620550433
VWR-22024 -- apply Bao's patch to beta
2011-01-31 19:18:58 -05:00
b2b4370e34
merge
2011-01-31 18:04:01 -05:00
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
09bfb95976
Fix for Sh-512: Scales use their previous maximum value
2011-01-31 16:23:22 -05:00
8e31ef838b
merge changes for storm-934
2011-01-31 13:04:57 -05:00
34078b34e4
pull changes for STORM-940 and CHOP-369
2011-01-31 12:46:58 -05:00
ed308d15bf
merge changes for storm-845
2011-01-31 12:34:17 -05:00
cb6d59513e
merge changes for storm-829
2011-01-31 12:32:57 -05:00
bbb4fb10a5
merge changes for storm-643
2011-01-31 12:26:23 -05:00
dd859c5e3e
merge changes for storm-351
2011-01-31 12:25:35 -05:00
64f153d547
Automated merge with file:///Users/oz/Work/V-D
2011-01-29 15:35:54 -05:00
2e2d990eb1
correct DOS line endings
2011-01-29 13:09:55 -05:00
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
125e216603
Automated merge with http://hg.secondlife.com/viewer-development
2011-01-28 21:23:35 -07:00
948afb8ef4
trivial: remove some debug code.
2011-01-28 21:23:19 -07:00
403b509f3a
automated merge
2011-01-28 17:02:32 -08:00
fc4a36c630
Merge
2011-01-28 16:44:50 -08:00
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
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
c111288a23
fixed the major memory leaking for SH-723/SH-847: memoy leaking
2011-01-28 17:19:42 -07:00
2ca05d4996
trivial: convert to "unix return"
2011-01-28 17:01:18 -07:00
9e91016527
Merge with head
2011-01-28 15:59:19 -08:00
d2b13de633
STORM-934 POSSIBLE FIX [crashhunters] crash at [2] LLPanelAvatarProfile::got_full_name_callback(LLUUID const &,std::basic_string,std::allocator > const &,bool) [secondlife-bin llpanelavatar.cpp]
2011-01-28 15:57:42 -08:00
435e9de7f1
merge
2011-01-28 17:42:30 -05:00
c285dddcca
SH-845 FIX - display a message before bailing out if CPU lacks SSE2 support
2011-01-28 17:42:02 -05:00
b4b3f78c45
pull back fixes from beta
2011-01-28 17:05:11 -05:00
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
ba8fcdcd19
SH-887 Upload model options available when MeshEnabled set to False
2011-01-28 12:17:00 -08:00
a9d023a461
merge fixes for SOCIAL-452 and STORM-927
2011-01-28 14:26:59 -05:00
b46281211a
Merge
2011-01-28 11:20:36 -08:00
ac7d7fea82
SOCIAL-452 FIX Default size of Web content floater is wrong - needs to be optimized for Web profile display
2011-01-28 11:18:11 -08:00
38dceba9b4
STORM-927 - FIX - [VWR-24426] SSL Handshake Failed Error when accessing web-based content on development viewers using recent Webkit 4.7
...
Also removed refs to debug vars used to specify location of pem file
2011-01-28 11:17:18 -08:00
98140b3cdc
merge changes for storm-634
2011-01-28 11:36:46 -05:00
4b354802c1
merge changes for social-473
2011-01-28 11:30:17 -05:00
ee2678be57
merge beta tags
2011-01-27 19:04:26 -05:00
7b7e9b0d0b
Added tag DRTVWR-33_2.5.0-beta2 for changeset 54d772d8687c
2011-01-27 14:45:42 -08:00
17232a83b1
Added tag DRTVWR-32_2.5.0-beta1 for changeset 345b17e7cf63
2011-01-27 14:45:14 -08:00
b356c9f0e5
Added tag DRTVWR-25_2.4.0-release for changeset 1ed382c6a08b
2011-01-27 14:44:57 -08:00
8f7bc74e0e
Added tag DRTVWR-27_2.4.0-beta2 for changeset 25bd6007e3d2
2011-01-27 14:44:40 -08:00
9ff19020bb
Added tag DRTVWR-26_2.4.0-beta1 for changeset 3bc1f50a72e1
2011-01-27 14:44:23 -08:00
75978a3c84
Added tag DRTVWR-13_2.3.0-release for changeset 6ad3d6fa35a4
2011-01-27 14:44:05 -08:00
prep linden