Roxie Linden
ab4b60c375
automated merge
2010-05-19 17:12:03 -07:00
Roxie Linden
1cc4fe4413
automated merge
2010-05-19 17:11:33 -07:00
Roxie Linden
5dc6043ae8
automated merge
2010-05-19 17:10:45 -07:00
Roxie Linden
e4efbc69ed
EXT-7410 Update Vivox SDK to 3.1.0001.8744
2010-05-19 17:09:54 -07:00
Nyx Linden
b9096fc954
automated merge with viewer-public
2010-05-19 19:49:50 -04:00
Nyx Linden
8487341b0f
AVP-44 WIP Back-end support for multiwearables
...
Changed a lot of areas of code that were not dealing with multiwearables properly.
Little functionality changed, as the support mechanisms that were out of date were
subtle, but getting closer to no further areas of code that don't properly support
multi-wearables.
Code reviewed by Vir.
2010-05-19 19:48:23 -04:00
Richard Nelson
8c4ec8ac9d
merge
2010-05-19 16:26:55 -07:00
Richard Nelson
f67e0d801d
EXT-6364 - Ctrl-Alt-F1 doesn't currently hide all the viewer UI
...
reviewed by leyla
2010-05-19 16:22:31 -07:00
Roxie Linden
ca9737d6d6
The certificate hostname verification was not taking into account changes in
...
hostname due to a redirect which is handled via curl.
I turned off the secapi hostname verification just allowing libcurls hostname
verification, as it's better anyway (it handles alt names)
2010-05-19 15:22:46 -07:00
Roxie Linden
61cb3d3113
automated merge
2010-05-19 13:25:11 -07:00
Loren Shih
a4c364561b
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Fix for scoping error leading to compile error.
2010-05-19 16:18:09 -04:00
Roxie Linden
81e9de4a7c
automated merge
2010-05-19 11:56:29 -07:00
Richard Nelson
90e17532df
merge
2010-05-19 11:07:52 -07:00
Loren Shih
d43ac77d1b
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Fix for ambiguity around LLSD usage.
2010-05-19 13:56:39 -04:00
Loren Shih
0924e3397c
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Added outfit baking notification.
Cleaned up some code around notifications.
Added some more clarity to notification message wording.
2010-05-19 13:54:37 -04:00
Nyx Linden
46fc55fca5
EXT-7208 FIX add color / tint to tattoos
...
Adds a color swatch to tattoo wearable that allows users to color their tattoos.
Defaults to white so should not affect existing tattoo wearables.
Code reviewed by Vir.
2010-05-19 12:16:20 -04:00
Tofu Linden
b550bb0f09
merge from PE's viewer-trunk
2010-05-19 09:56:48 +01:00
Roxie Linden
1f02c1dd32
DEV-50239 - windows 2.0 viewer using 'ruth' as default avatar on SLE grids
...
The problem, llstartup was parsing the login response indicating the
newuser-config (which contains the default avs) incorrectly.
The response is returned as a map within an array (<array><map>...</map></array>)
We were parsing it as a simple map.
2010-05-19 01:15:15 -07:00
Roxie Linden
f46eb52e90
Add digicert high assurence CA
2010-05-19 00:29:49 -07:00
Roxie Linden
22894b2921
automated merge
2010-05-19 00:13:24 -07:00
Paul Guslisty
a4fc76a0f7
EXT-7219 FIXED Hooked up the avatar gender radio buttons
...
- Added callback for radio buttons
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/392/
--HG--
branch : product-engine
2010-05-19 08:25:09 +03:00
Roxie Linden
cae4e785be
Allow update of the default CAs on install
2010-05-18 22:18:54 -07:00
Richard Linden
8e474b095a
merge
2010-05-18 16:31:38 -07:00
Richard Linden
5921f2c14b
EXT-7398 FIXED negative top/bottom coordinates do the wrong thing with topleft layout
...
reviewed by Leyla
2010-05-18 16:26:18 -07:00
Roxie Linden
75755a6751
Add missing debug grids
2010-05-18 15:56:42 -07:00
Loren Shih
c70be25eca
Fix for build error (not from my code ;-) ).
2010-05-18 18:28:23 -04:00
Nyx (Neal Orman)
263877fec1
FIX: crash on texture load callback timer.
...
After reviewing with bao, re-initialize memory to be NULL after delete to ensure that stray callbacks don't try to use it.
2010-05-18 18:03:01 -04:00
Nyx (Neal Orman)
0b5c84df94
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-05-18 17:44:32 -04:00
Nyx (Neal Orman)
b9a8e7f428
crash prevention for viewer debug logging.
...
Will be code reviewed before push, will be removed before release.
-Nyx
2010-05-18 17:44:24 -04:00
Loren Shih
529a88458a
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Superficial improvements to llinfos messaging.
2010-05-18 17:30:31 -04:00
Loren Shih
3c25cf6750
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Added timestamp for avatar rez messages.
Added messaging when entering/leaving Edit Appearance Mode.
2010-05-18 17:10:44 -04:00
Sergei Litovchuk
e041b67501
Removed duplicated include.
...
--HG--
branch : product-engine
2010-05-18 23:37:37 +03:00
Sergei Litovchuk
09a58b804b
EXT-7158 FIXED Moved lltextutil from newview to llui library.
...
Reviewed by Richard Nelson and Mike Antipov at https://codereview.productengine.com/secondlife/r/363/
--HG--
branch : product-engine
2010-05-19 01:20:39 +03:00
Loren Shih
dd4c0fa417
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Fix for conditional deletion.
2010-05-18 16:16:10 -04:00
Loren Shih
955473266e
AVP-72 FIXED Debug settings for gathering Welcome Island Rez time statistics
...
Fixed memory leak.
Prettied up formatting for debug readouts.
Added more notifications for rez and cloud time.
2010-05-18 15:15:08 -04:00
Yuri Chebotarev
d60a5745c7
merge
...
--HG--
branch : product-engine
2010-05-18 18:01:47 +03:00
Yuri Chebotarev
5689f2884a
ext-5600 partitial fix Add missing message to notification.xml
...
Reviwed by Mike Antipov at https://codereview.productengine.com/secondlife/r/400/
--HG--
branch : product-engine
2010-05-18 18:01:08 +03:00
Yuri Chebotarev
bf0a0de466
ext-7106 FIX Always prevent tab switching while processing tab switch request
...
reviwed by Mike Antipov at https://codereview.productengine.com/secondlife/r/402/
--HG--
branch : product-engine
2010-05-18 17:59:15 +03:00
Yuri Chebotarev
d3cfb6ca36
EXT-7112 fix Set map pos,bgnd and size in code to match mockup
...
--HG--
branch : product-engine
2010-05-18 17:57:04 +03:00
Loren Shih
3e0c0b86c0
EXT-7384 FIXED Aesthetic changes to debug textures floater
...
Fixed missing closing XML tag.
2010-05-18 10:24:21 -04:00
Loren Shih
9ce5906030
automated merge
2010-05-18 10:22:47 -04:00
Nyx (Neal Orman)
469ce412e3
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-05-18 10:20:51 -04:00
Nyx (Neal Orman)
b416dcb73b
adding verbose logging around your own avatar rez time. Documents load times
...
for each component texture at each discard level, as well as baked texture
upload times, and reports the timing of each texture to the console when your
avatar sends out its appearance data to the server.
Reviewed by Seraph, will be removed before release.
-Nyx
2010-05-18 10:20:44 -04:00
Loren Shih
46d799ab51
automated merge
2010-05-18 10:18:03 -04:00
Andrew Polunin
d861768345
EXT-7381 FIXED (Nothing happens after clicking on some verb buttons of 'My Inventory' side panel)
...
- \"options_gear_btn\", \"trash_btn\" and \"add_btn\" now initialized using getChild of the main inventory panel (to avoid another break if the \"bottom_panel\"'s control class will be changed again from LLLayoutStack to something other, e. g. reverted back to LLPanel)
- mTrashButton member was added (which corresponds to \"trash_btn\" control) to optimize performance a little: LLPanelMainInventory::updateListCommands() updates \"trash_btn\"'s enabled state, so to avoid searching using getChild() again and again, a separate member was created.
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/401/
--HG--
branch : product-engine
2010-05-18 15:19:03 +03:00
Andrew Polunin
8ea6cc7dc2
EXT-7362 FIXED (World Map - make teleport button green)
...
Default value for button's attribute 'image_unselected' was overriden: image_unselected=\"PushButton_On\".
Reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/399/
--HG--
branch : product-engine
2010-05-18 14:15:52 +03:00
Alexei Arabadji
e9d3fcbbb9
EXT-7365 FIXED Added alert toast panel to GLOBAL group of exclude list of transient floater manager(the same as sidebar);
...
reviewed by Mike Antipov at https://codereview.productengine.com/secondlife/r/396/
--HG--
branch : product-engine
2010-05-18 11:47:16 +03:00
Mike Antipov
b6ed10e828
Merge from default branch
...
--HG--
branch : product-engine
2010-05-18 10:15:55 +03:00
Loren Shih
bc90ff8840
automated merge
2010-05-17 20:42:03 -04:00
Loren Shih
77068bcf31
EXT-7385 FIXED Show load and discard level for loading textures
...
More debugging information is now shown for loading textures
2010-05-17 20:41:30 -04:00