db1af2445d
Initial code for the upload model wizard - loading model is working, not much else
2010-12-09 17:30:17 -08:00
a1e59112d0
Fix for SH-424
2010-12-08 14:50:25 -05:00
9d16536220
Automated merge from mesh-development
2010-12-08 10:34:28 -05:00
6a59861bde
Automated merge up from viewer-development
2010-12-07 14:56:36 -05:00
6a0c02c1b1
Bug fix. Joint ids were not being reset. The issue was noticeable when you attached and then reattached a rigged mesh with offsets. The reattached mesh would not be offset correctly.
2010-12-07 14:24:07 -05:00
d9b4570883
Pull viewer-beta in
2010-12-06 17:17:55 -08:00
f59033bfd8
STORM-678 : pull into viewer-beta
2010-12-06 17:15:57 -08:00
8afbb58d4c
Pull viewer-beta in
2010-12-06 16:56:25 -08:00
8d3f9a275f
STORM-378 : pull into viewer-beta
2010-12-06 15:40:48 -08:00
395ed1fc8d
STORM-579 : pull into viewer-beta
2010-12-06 15:38:01 -08:00
4669dae304
STORM-730, STORM-717, STORM-690 : pull into viewer-beta
2010-12-06 15:28:24 -08:00
344ed17d87
Automated merge with https://hg.secondlife.com/mesh-development
2010-12-06 17:36:33 -05:00
2bbb4223bb
BUILDFIX linux build broken due to a merge conflicts
...
merge broke the linux build, we were trying to strip a script which is a non-binary file.
Restored the correct syntax and build works again. yay!
Reviewed by Prep
2010-12-06 17:36:28 -05:00
cb8dbaf0ef
Fix for SH-542
2010-12-06 17:15:56 -05:00
e03e3257ab
STORM-730 FIXED Made Movement Controls, Camera Controls and Nearby Voice floaters use active floater transparency.
2010-12-06 19:19:31 +02:00
37c65e371d
STORM-690 ADDITIONAL FIX Hide "Loading..." text that can be seen under transparent Avatar Picks accordion.
2010-12-06 16:14:50 +02:00
8acc2ec9f6
STORM-690 FIXED Underlying panels were visible in undocked sidepanels.
...
By the way, fixed losing focus when switching between panels in Me and Places SP (which made the floater semi-transparent).
2010-12-06 15:01:36 +02:00
45c7663cef
Moved 2.4.0-beta1 tag to the correct changeset
2010-12-05 06:34:17 -08:00
d607b9c01a
Added tag 2.4.0-beta1 for changeset 3bc1f50a72e1
2010-12-05 06:18:15 -08:00
b9fa0e9bbe
STORM-717 FIXED Made nearby chat toasts respect transparency settings:
...
* Normally toasts are as opaque as specified by "inactive floater opacity" setting.
* When mouse is hovering a toast, the toast uses "active floater opacity" setting.
* Fading toasts have 1/2 of "inactive floater opacity".
2010-12-04 13:07:51 +02:00
d0ec374e15
STORM-717 WIP Cleanup: removed unused on_mouse_enter callback from LLToast.
2010-12-04 12:15:47 +02:00
40e3f15988
Merge
2010-12-03 15:48:17 -08:00
35c67ca7fb
Merge
2010-12-03 15:44:39 -08:00
35d50fe36e
changing colladadom url from https to http to prevent urllib errors
2010-12-03 15:43:44 -08:00
bff87676d7
VWR-21764 FIX: changed two vars for curl_easy_getinfo to double
2010-12-03 18:42:31 -05:00
32db8988ff
merge
2010-12-03 17:37:00 -05:00
46a2bbf8da
updated message template md5sum
2010-12-03 17:36:17 -05:00
7549df0eaf
merging beta fixes after 2.4.0-beta1
2010-12-03 17:09:22 -05:00
4f5b27c933
Added tag 2.4.0-beta1 for changeset dc6483491b4a
2010-12-03 17:05:01 -05:00
8e7632552b
automated merge from mesh-development
2010-12-03 16:52:40 -05:00
2bc6e28e0e
Fix for overlapping UI elements in panel_preferences_graphics1 due to bad merge.
2010-12-03 16:52:23 -05:00
c29203f3f3
Fix for clobbered deferred rendering UI.
...
Fix for compile errors from llappviewer.cpp merge.
2010-12-03 16:36:51 -05:00
b9536434f7
merge
2010-12-03 15:33:11 -06:00
6cfb2c81a8
Get rid of CameraCoC and adjust focal length and fnumber for every day use.
2010-12-03 15:30:00 -06:00
894db03cfd
STORM-378 ADDITIONAL FIX Fixed playing snapshot animation and sound when a snapshot is refreshed.
2010-12-03 23:01:10 +02:00
faa08ed4a1
merge
2010-12-03 15:41:53 -05:00
2f4a3197bf
Added timer-related logging during logperformance
2010-12-03 15:40:42 -05:00
f79615cace
Automated merge up from viewer-development
2010-12-03 14:49:33 -05:00
7ed0938226
STORM-579 FIXED SLURLs color for residents and objects names in plain text chat match the user setting for "URLs" in the Color tab in Prefs.
...
Avatar names SLURLs now use the user color setting for "URLs" everywhere across the viewer.
2010-12-03 20:45:53 +02:00
4e922949a9
Fix for SH-479
2010-12-03 13:02:34 -05:00
963e3346b1
Automated merge up from viewer-development
2010-12-03 10:41:46 -05:00
af18a69c3e
merge change to default transparency
2010-12-03 09:31:21 -05:00
2491555272
pull latest fixes back from viewer-beta
2010-12-03 07:33:24 -05:00
50b6114862
Tiny change to panel_login.xml so Start Location preferences work under all circumstances
2010-12-03 07:30:19 -05:00
67c01ab1fb
merge up to new beta 1 candidate
2010-12-03 07:06:04 -05:00
9e67a2d710
STORM-544 ADDITIONAL FIX Set default transparency for inactive floaters to 65%.
2010-12-03 12:02:41 +02:00
1ef5278bd6
merge
2010-12-03 03:55:35 -06:00
3daaf4597d
Add extern declarations of GL_ARB_framebuffer_object to glheades.h
2010-12-03 03:54:24 -06:00
ec9ba94b69
DoF tweaks -- halo hiding, etc.
2010-12-03 03:52:57 -06:00
a74299b76b
Automated merge with https://hg.secondlife.com/mesh-development
2010-12-03 03:28:39 -06:00
leyla_linden