Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Erica's design. Now any errors during the L$ purchase process will
give you a nice prompt to visit the SL website.
Replaced all user-visible references to the illegal term "currency"
with the term "L$".
Also fixed an outstanding bug with this floater: if you clicked the
Buy button but then cancelled the confirmation dialog, then the Buy
button would remain disabled. Now the Buy button is only disabled
during periods when you actually cannot buy.
Added initial support for local currencies, with the use of a new
[LOCALAMOUNT] field in the XUI files. When the XML-RPC server can
actually return local currency details, we can hook this up by just
changing llcurrencyuimanager.cpp.
Discussed XML-RPC interaction with Morpheus. Thanks to Erica for
the images and first cut at the XUI.
CHANGES:
minor layout change: "start location" and "remember password" weren't on the same horizontal line.
DEV-35120 image_unselected art was "transparent.j2c" - switched it out for PushButton_Off
I18N: more things are missing a.. you guessed it, a name= parameter. Breaks localization.
forgot to check this in earlier...fixes off-by-one crash when editing a script
DEV-36740 change the displayed string per Erica's request re 'You can only set your Home Location...' VIEWER-SIDE text change. This does not change the actual message coming from the server
EXT-689 Odd spinner behaviour - For Sale Price -- reviewed by james
DEV-26973 Internationalize the server msg Youcan'tset this place as home -- reviewed by james
EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- reviewed by james
EXT-618 Low/Mid/High response is broken in Preferences > Graphics -- to be reviewed
EXT-655 Cannot choose Both logging options in Preferences -- to be reviewed
Changes to notifications.xml text to fit Style Guide and some renamed menu items
EXT-147 Ongoing revisions to new gestures layout.
DEV-35097 catch more instances of 'SLURL' and make them 'SLurl'
Removed Info Displays and Buy Currency Test from top menus.
Clean up code to use proper childGetFoo and childSetFoo calls, as well as setCommitCallback using slots.
De-inlined LLAvatarIconCtrl paramblock constructor because I was doing a full rebuild anyhow.
Commented about use of childSetCommitCallback(). De-inlined LocalizedString paramblock constructor.
eliminated memory leak
I18N: more things are missing a name= parameter, breaks localization.
EXT-714 Updated panels in sidetray that were not using the scroll_container element to adjust for viewer heights.
fix for llmessage_test crash in Windows Release builds
DEV-11254 I18N: replace all string instances of "Second Life" - do this in the foreign languages too
DEV-11254 I18N: replace all string instances of "Second Life" - found new instances from merged code
potential fix for unit test crash on parabuild, moved statics into singleton member variables to get around potential dual instantation of statics on different modules
DEV-36809 Click target for slider handles is too small -- reviewed by steve
EXT-403 change getChild<LLSpiner> to LLUICtrl to make it generic -- reviewed by richard
DEV-35938 Horizontal scroll thumb too high -- to be reviewed
EXT-386 clean up warnings - initCommitCallback...
Rename Product Engine's LLFloaterMiniInspector to LLInspectAvatar, clean up XUI XML, clean up construction code, move refresh method to postBuild() so widgets are constructed before refresh, fixed a member variable in llavatarlistitem.cpp. Reviewed with Leyla.
Login menu > Debug > Avatar Inspector shows test avatar inspector. Also added to main menu > Debug > XUI > Avatar Inspector. Changed text/layout of dummy inspector. Not reviewed.
Merging revisions 131558-131975 of svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-22 into D:\viewer-2.0.0-3, respecting ancestry
svn merge -r 129913:131718 svn+ssh://svn.lindenlab.com/svn/linden/branches/pluginapi/pluginapi_05
Some branch shenannigans in the pluginapi_05 branch caused this to become a two-part merge.
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification
This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
EXT-172 - adding non-unicode support for group name line_editor
EXT-310 text was squished, moved things around so there was was more space between text blocks.
EXT-313 "me" panel
EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml
EXT-315 replaced word "mute" with "block"
EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
EXT-323 killed some two items
EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox
EXT-330 Sidetray filter - text overlaps search icon inside textbox
EXT-261 I18N: Labels in /character/avatar_lad.xml are not localizable
EXT-392 Rearranged floater_inventory_items_properties.xml to match spec
DEV-35897 Filters in sidebar remain active even after user has changed/closed tab
DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency
DEV-36987 - Pressed states needed for widgets
DEV-36795 Remove slurl tooltip from navigation bar location box
DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy
James Cook