Leyla Farazha
|
e69aa18c0d
|
SH-1247 Upload Wizard should pull in textures, if defined in .dae
|
2011-03-29 16:32:28 -07:00 |
|
Leyla Farazha
|
7c993e4490
|
fixing line endings in llfloatermodelpreview.cpp
|
2011-03-28 13:16:34 -07:00 |
|
Leyla Farazha
|
ae086d95fa
|
Merge
|
2011-03-28 13:15:49 -07:00 |
|
Leyla Farazha
|
46297b9543
|
SH-1038 Refine UI sizes and positions to match spec
|
2011-03-28 13:13:39 -07:00 |
|
Leyla Farazha
|
7c27fd2037
|
fixing unused LLComboBox issue that was causing mac/linux breakage
|
2011-03-28 13:12:47 -07:00 |
|
prep
|
835671f278
|
Bug fix for pelvis offset not respecting full value
|
2011-03-28 13:27:50 -04:00 |
|
prep
|
dd475862d7
|
merge
|
2011-03-28 11:13:20 -04:00 |
|
prep
|
115f051003
|
WIP pelvis z offset can be adjusted between -3 to +3
|
2011-03-28 11:12:14 -04:00 |
|
Loren Shih
|
690105630e
|
Automated merge up from viewer-development into mesh-development
|
2011-03-28 10:26:00 -04:00 |
|
Oz Linden
|
68a7f7c241
|
increment viewer version to 2.6.3
|
2011-03-28 08:56:07 -04:00 |
|
Oz Linden
|
44ec69afab
|
Added tag 2.6.2-start for changeset 56b2778c743c
|
2011-03-28 08:55:04 -04:00 |
|
Oz Linden
|
af3f0f49d7
|
merge changes for storm-987
|
2011-03-27 21:45:43 -04:00 |
|
Merov Linden
|
29bcedaf02
|
STORM-987 : Fix the creation of images in local dir
|
2011-03-25 17:18:28 -07:00 |
|
Merov Linden
|
b7b9a37bc1
|
STORM-1021 : pull into viewer-development
|
2011-03-25 16:43:49 -07:00 |
|
Merov Linden
|
fbb280d84e
|
STORM-1030 : pull into viewer-development
|
2011-03-25 16:41:36 -07:00 |
|
Merov Linden
|
136e294c4c
|
STORM-36 : pull into viewer-development
|
2011-03-25 16:39:36 -07:00 |
|
Xiaohong Bao
|
ebfc46a9ae
|
Automated merge with http://hg.secondlife.com/mesh-development
|
2011-03-25 15:58:54 -06:00 |
|
Leyla Farazha
|
c7906b34fd
|
Merge
|
2011-03-25 14:11:27 -07:00 |
|
Leyla Farazha
|
3528753a3a
|
SH-1104 Add additional panel before review step.
|
2011-03-25 14:10:35 -07:00 |
|
Xiaohong Bao
|
971eac1aa2
|
fix for SH-838: Crash if exit during mesh upload
|
2011-03-25 14:04:52 -06:00 |
|
Loren Shih
|
44774cd265
|
Automated merge up from viewer-development into mesh-development
|
2011-03-25 10:47:49 -04:00 |
|
Merov Linden
|
5d41238786
|
STORM-1104 : pull into viewer-developement
|
2011-03-24 20:15:33 -07:00 |
|
Merov Linden
|
7010eb1368
|
Pull from viewer-beta
|
2011-03-24 20:08:31 -07:00 |
|
Leyla Farazha
|
f7ec54a92f
|
Merge
|
2011-03-24 12:32:33 -07:00 |
|
Leyla Farazha
|
673801e644
|
SH-1205 Lock out ability to change sculpt stitching type or sculpt map when sculpt stitching type is set to mesh
|
2011-03-24 12:31:24 -07:00 |
|
prep
|
d2bb490702
|
Crash fix for SH-1176 and WIP for pelvis z offset
|
2011-03-24 09:48:34 -04:00 |
|
Oz Linden
|
4386bb173b
|
merge changes for storm-1018
|
2011-03-24 07:48:06 -04:00 |
|
Merov Linden
|
17186d6dc1
|
Pull from lindenlab/viewer-development
|
2011-03-23 15:28:03 -07:00 |
|
Vadim ProductEngine
|
df450ff17b
|
STORM-1021 ADDITIONAL_FIX Replaced usual object inspector with the remote one in nearby chat toasts.
|
2011-03-23 22:58:49 +02:00 |
|
eli_linden
|
1c375a8c88
|
INTL-30 WIP light viewer Set2 translations and new files for ES
|
2011-03-23 11:40:02 -07:00 |
|
Leyla Farazha
|
3ad81bb4a6
|
Merge
|
2011-03-23 11:36:00 -07:00 |
|
Leyla Farazha
|
a2c659378b
|
SH-1203 Remove "meshes" folder from inventory
|
2011-03-23 11:35:07 -07:00 |
|
Loren Shih
|
62a958d341
|
Automated merge up from viewer-development into mesh-development
|
2011-03-23 12:40:22 -04:00 |
|
Richard Linden
|
68e2813b41
|
SOCIAL-778 FIX Make how to web content wider
|
2011-03-22 16:57:21 -07:00 |
|
eli_linden
|
e4a4d75104
|
INTL-30 WIP light viewer Set2 translations and new files for FR, PT, DE
|
2011-03-22 16:44:48 -07:00 |
|
Dave Parks
|
89e0964682
|
merge
|
2011-03-22 17:24:10 -05:00 |
|
Dave Parks
|
6ff87e2840
|
SH-1169 Import from slm instead of dae when appropriate.
|
2011-03-22 17:23:48 -05:00 |
|
Paul ProductEngine
|
2de6061d55
|
STORM-1030 FIXED Main menu change: 'Me->Change Outfit' to 'Me->My Appearance'
Changed label in:
- Main menu
- Self avatar menu
- Self avatar attachment menu
|
2011-03-22 19:42:58 +02:00 |
|
Kelly Washington
|
a9ac07acf2
|
ER-320 Fix public urls in top scripts.
|
2011-03-22 10:14:45 -07:00 |
|
Xiaohong Bao
|
380f940255
|
Automated merge with http://hg.secondlife.com/mesh-development
|
2011-03-21 16:40:55 -06:00 |
|
Xiaohong Bao
|
a2bcd2a872
|
fix for SH-1162: [regression] Mesh Viewer Crashes on Enabling Lighting and Shadows
|
2011-03-21 16:40:23 -06:00 |
|
Dave Parks
|
51a4867ae6
|
SH-1168 Export upload data to disk on upload.
|
2011-03-21 17:31:25 -05:00 |
|
Dave Parks
|
a034ffd4b1
|
Remove unneeded assertion.
|
2011-03-21 17:30:26 -05:00 |
|
Dessie Linden
|
3b33ed8a25
|
Added tag DRTVWR-41_2.6.0-beta2, 2.6.0-beta2 for changeset 9e4641f4a787
|
2011-03-21 15:03:43 -07:00 |
|
Dave Parks
|
5b9ee2a9d5
|
merge
|
2011-03-21 10:51:52 -05:00 |
|
Dave Parks
|
bf3fb25663
|
SH-1069 Fix for bump maps not loading fully -- don't clear bump image list on toggling deferred rendering, but do make sure a loaded callback exists when bump resolution or desired number of components is lacking. Also, subtract radius of prim from distance to face for virtual size calculations (makes heavily tiled textures on largish spheres fully res when appropriate).
|
2011-03-21 10:51:28 -05:00 |
|
Dave Parks
|
0b4a0f8e23
|
Get rid of ugly seam at near/far focal planes.
|
2011-03-21 10:46:42 -05:00 |
|
Loren Shih
|
be553242ef
|
Automated merge up from viewer-development into mesh-development
|
2011-03-21 10:38:39 -04:00 |
|
Oz Linden
|
df63c6931e
|
update build parameters for Oz builds
|
2011-03-21 08:48:04 -04:00 |
|
Oz Linden
|
2651a37b04
|
increment viewer version to 2.6.2
|
2011-03-21 08:42:58 -04:00 |