Erica
9c0d3e4e86
resolving sidepanel conflict
...
--HG--
branch : avatar-pipeline
2009-12-11 13:17:19 -08:00
Erica
5b1c92ebb0
EXT-906 Update inventory properties floater with new permissions layout
2009-12-11 11:24:31 -08:00
Eric M. Tulla (BigPapi)
1f3a554709
Minor gcc compile fix
...
--HG--
branch : avatar-pipeline
2009-12-11 14:16:46 -05:00
Eric M. Tulla (BigPapi)
f042f35381
Merge of viewer2 into avp branch
...
--HG--
branch : avatar-pipeline
2009-12-11 13:37:00 -05:00
Nyx (Neal Orman)
c74d5c483c
EXT-3317 missing string in appearance editor
...
name string wasn't capitalized so couldn't find the actual label to apply.
capitalizing "Wrinkles" makes the string be found. yay.
Reviewed by Vir
2009-12-11 12:47:36 -05:00
Nyx (Neal Orman)
ea3b996143
Automated merge with ssh://nyx@hg.lindenlab.com/tulla/avatar-pipeline-2-0/
...
--HG--
branch : avatar-pipeline
2009-12-11 12:07:49 -05:00
Nyx (Neal Orman)
3089e1a17a
EXT-2718 avatar render cost higher in 2.0 than in 1.23
...
previous fix fixed the double-counting of texture costs. resulting ARC
was ~99 points higher for most avatars. This patch makes the cost shoot
up again, as ARC was improperly computed in 1.23 and before.
This makes the cost for an avatar increase 10 points per prim instead of
per-attachment, which is how we have documented it. Also used constants to
eliminate magic numbers and increased ARC limit from 1024 to 2048.
Will request feedback on change from BSI:STU
Code reviewed by Bigpapi
--HG--
branch : avatar-pipeline
2009-12-11 12:07:35 -05:00
Lynx Linden
eda8634b17
EXT-3394: Remove manual voice gain controls.
...
The new Vivox SDK supports Automatic Gain Control (AGC), so we
shouldn't need to change the local gain level from the default of 50%.
This change sets the initial gain level to 50 (instead of 62) and
removes the local gain sliders from the Sound Preferences floater and
the Voice Controls floater. The latter was not hooked up yet anyway.
2009-12-11 15:06:32 +00:00
Brad Payne (Vir Linden)
6d9fe27a25
merge
...
--HG--
branch : avatar-pipeline
2009-12-11 10:04:46 -05:00
Lynx Linden
9f0e4f6683
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-11 11:31:00 +00:00
Lynx Linden
3c96173fce
EXT-3119 DEV-43503 DEV-43497: Fix secondlife://app/parcel crash.
...
The handler for secondlife:///app/parcel/{UUID}/about SLurls now opens
the Place side tray and displays the parcel information there.
2009-12-11 11:29:10 +00:00
Lynx Linden
729f3bbd34
EXT-332: Added Buy L$ link for Exchange Rate.
...
As per the international billing team.
Just waiting for the "payment method and currency" URL now.
2009-12-11 09:21:43 +00:00
Nat Goodspeed
cc8305cd20
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-10 22:38:19 -05:00
Nat Goodspeed
19122e164c
Add LL(URLDispatcher,CommandDispatcher,PanelLogin)Listener
...
LLURLDispatcherListener accepts requests for LLURLDispatcher.
LLCommandDispatcherListener accepts requests for LLCommandDispatcher.
LLPanelLoginListener accepts requests specifically for LLPanelLogin. Initially
it supports a simulated click to the "Log In" button.
2009-12-10 22:30:57 -05:00
Soft Linden
e9a744131d
DEV-44138 About Land - Access tab - make AO overriden options clear
2009-12-10 20:39:31 -06:00
Nyx (Neal Orman)
6374834355
EXT-3302 invisible avatar w/ bling crashes mac viewers
...
not mac-specific. We were treating IMG_INVISIBLE as a baked texture when an avatar used
it as a bake. However, some baked textures have 5 channels, IMG_INVISIBLE
has 4. Asking KDU to decode the 5th channel of a 4 channel image resulted in a crash.
Fix skips the callback for loading morph masks from a bake if the bake image ID is
IMG_INVISIBLE.
Code reviewed by Seraph
--HG--
branch : avatar-pipeline
2009-12-10 21:39:15 -05:00
brad kittenbrink
47c68ba226
Added better error handling to LLEventHost, so we no longer crash when shutting down.
...
Also cleaned up logging in llstartup, llwlparammanager, and llwaterparammanager.
reviewed by Mani.
2009-12-10 17:17:12 -08:00
Soft Linden
225cd2d5a7
DEV-44130 Clarify AO messages on Region/Estate - Region tab
2009-12-10 19:09:51 -06:00
Soft Linden
f0e773a6b2
Merge changes
2009-12-10 18:49:43 -06:00
Soft Linden
12f91564e8
DEV-28327 Remove ELAR email field from client
2009-12-10 18:46:07 -06:00
Brad Payne (Vir Linden)
264446a5ce
For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
...
--HG--
branch : avatar-pipeline
2009-12-10 19:35:58 -05:00
Xiaohong Bao
7abdf3b9a0
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-10 17:05:21 -07:00
Xiaohong Bao
2237973792
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-10 17:01:17 -07:00
Ramzi Linden
af3aae559e
Delete the 'Test' language from the viewer.
...
There is no more time to update it to last month of UI changes; and its use for Localizability Testing is now done.
2009-12-10 16:00:40 -08:00
Xiaohong Bao
558190f50c
fix for DEV-43870: EXT-3137: Crash when add quicktime media to multiple faces.
2009-12-10 16:56:09 -07:00
Brad Payne (Vir Linden)
b131314dba
Fix for r. click Edit on a link to wearable
...
--HG--
branch : avatar-pipeline
2009-12-10 18:39:44 -05:00
Brad Payne (Vir Linden)
e7ef47e825
For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
...
--HG--
branch : avatar-pipeline
2009-12-10 18:19:23 -05:00
Lynx Linden
5ec1ecc314
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 22:39:07 +00:00
Lynx Linden
b3f8cec38c
DEV-43977: Changed pre-login help browser behavior.
...
The special pre_login_help topic is now only displayed when the user
clicks on the "Need help logging in?" link on the login screen, or
selects the top-level Help > Second Life Help (F1) menu.
2009-12-10 22:38:29 +00:00
Eric M. Tulla (BigPapi)
f0146befc7
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-10 16:09:00 -05:00
Eric M. Tulla (BigPapi)
9db47b1d4b
Fix for EXT-3368 - "Save Texture" functionality was no longer respecting perms
2009-12-10 16:07:54 -05:00
Brad Payne (Vir Linden)
6af53dd7e2
For EXT-2858: Determine gear menu / right-click menu choices for AppearanceSP
...
--HG--
branch : avatar-pipeline
2009-12-10 15:31:08 -05:00
Nat Goodspeed
99d757e041
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-10 14:29:45 -05:00
Loren Shih
e85cf743e5
automated merge viewer2.0->viewer2.0
2009-12-10 14:25:25 -05:00
Nat Goodspeed
33cd0bfdfb
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2009-12-10 14:11:49 -05:00
Nat Goodspeed
466a8d2664
Fix llmediaplugintest.cpp for non-Windows platforms
2009-12-10 14:10:10 -05:00
Lynx Linden
d575af6a65
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
2009-12-10 19:05:41 +00:00
Loren Shih
1ca104f325
dos2unix fix for llpanelgroup.cpp.
2009-12-10 14:05:24 -05:00
Loren Shih
9dfcc83098
automated merge viewer2.0->viewer2.0
2009-12-10 14:04:45 -05:00
Loren Shih
0d186b0712
Dos2Unix fix for llselectmgr.cpp
2009-12-10 14:03:19 -05:00
Lynx Linden
d06ef88783
DEV-43679: Display god level warning in Search window.
...
If you change your god level from when you performed a search, the
search results may be inappropriate for your god level (we pass the
current god status to the search web pages). When this is the case, we
now display a warning at the bottom of the search floater to let the
user know that they should redo their search.
2009-12-10 19:02:33 +00:00
Loren Shih
6215fa4c13
automated merge viewer2.0->viewer2.0
2009-12-10 13:46:16 -05:00
Steve Bennetts
f6a1858884
Merge with product-engine
2009-12-10 10:14:17 -08:00
Igor Borovkov
3e13bc913f
merge
...
--HG--
branch : product-engine
2009-12-10 19:02:32 +02:00
Igor Borovkov
f11c604456
fixed EXT-3247 (There is no title in Ad-hoc IM window, and only "To" is shown if user accepts Ad-hoc conference)
...
sometimes a session name received from a server is empty,
added generating a correct session name in such a case
--HG--
branch : product-engine
2009-12-10 18:45:36 +02:00
Alexei Arabadji
6a59342963
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
...
--HG--
branch : product-engine
2009-12-10 18:39:22 +02:00
Alexei Arabadji
5c1cea1e76
implemented EXT-3341 “URLs should be clickable in the IM toasts”,
...
replaced mouseDown callback with handleMouseDown method to provide possibility
to separate mouse down event on panel and in panel children;
--HG--
branch : product-engine
2009-12-10 18:39:06 +02:00
Paul Guslisty
9e8bbf098a
Fixed low bug EXT - 3255 (Call button is enabled in the People & Profile panels while voice is disabled)
...
--HG--
branch : product-engine
2009-12-10 18:18:11 +02:00
Paul Guslisty
86d8d35341
Fixed linux build
...
--HG--
branch : product-engine
2009-12-10 18:08:07 +02:00
Loren Shih
6b0c1f97f4
EXT-2819 : Crash in appearance color picker
...
Enforcing out-of-order destruction in llfloatercustomize to avoid this crash.
2009-12-10 11:01:32 -05:00