- G*d kills a kitten every time you put a hard return in the middle of a localizable sentence.

fixed lltransientfloatermgr.cpp addFocusChangeCallback
commenting out LLFLoaterIM setFocusLostCallback for now.

- string changes only, NO CODE changed.

* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160
* Changes: EXT-1139 (places context menu)

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.

merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1868 https://svn.aws.productengine.com/secondlife/pe/stable-2@1876 -> viewer-2.0.0-3
* Bugs: EXT-1111 EXT-915 EXT-1131 EXT-1200 EXT-1202 EXT-1201 EXT-1205 EXT-1212 EXT-1173 EXT-1229 EXT-1218 EXT-1164 EXT-996 EXT-821 EXT-1030 EXT-1031 EXT-816
* Major Bugs: EXT-1142 (timeout during login due to processing group IMs)
* Changes: EXT-1216 (minimize message well)

returned no media plugin for text/html (NULL dereference), which seems
to be happening in viewer-2.0.0-3 for me at the moment.

Clearly there's not too much to do if we can't display HTML, but this
fix will at least stop the help browser from crashing.

navigation bar when trying to access if the input is a valid SLURL.

Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.

Copy-paste caused duplicate control and widget names in the script errors checkbox & radio buttons; Need to fix this before code is written for it.
Need a unique name= for localization

- edited 2 words in the file

- also fixes the specific cases of VWR-3766, VWR-1794
- string changes only, NO CODE changed.
- this is needed so that we can begin the Localization round

svn merge -r134800:134805 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer2help-3

Cherry pick of simple fix for duplicate inventory folders (one non working) in some inventory panel views.
Result of:
svn merge -c 134827 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-10 .

replaced mFocusChangedSignal that PE added with our hierarchical focus mgmt

reviewed by Leyla

Result of: (NO CONFLICTS)
svn merge -r 134301:134742 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-9 .

DEV-14830

DEV-14830

merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1830 https://svn.aws.productengine.com/secondlife/pe/stable-2@1839 -> viewer-2.0.0-3

JIRAS:
EXT-96 EXT-204 EXT-312 EXT-334 EXT-479 EXT-498 EXT-514 EXT-637 EXT-647 EXT-746 EXT-748 EXT-749 EXT-757 EXT-789 EXT-794 EXT-808 EXT-817 EXT-823 EXT-831 EXT-834 EXT-837 EXT-844 EXT-848 EXT-862 EXT-876 EXT-896 EXT-897 EXT-898 EXT-899 EXT-910 EXT-912 EXT-918 EXT-921 EXT-925 EXT-926 EXT-928 EXT-930 EXT-931 EXT-935 EXT-938 EXT-939 EXT-952 EXT-985 EXT-986 EXT-992 EXT-994 EXT-995 EXT-996 EXT-997 EXT-998 EXT-1001 EXT-1004 EXT-1010 EXT-1012 EXT-1016 EXT-1018 EXT-1020 EXT-1028 EXT-1041 EXT-1044 EXT-1051 EXT-1052 EXT-1061 EXT-1069 EXT-1071 EXT-1074 EXT-1075 EXT-1076 EXT-1078 EXT-1080 EXT-1081 EXT-1082 EXT-1083 EXT-1085 EXT-1092 EXT-1093 EXT-1099 EXT-1100 EXT-1101 EXT-1104 EXT-1106 EXT-1111 EXT-1113 EXT-1114 EXT-1115 EXT-1116 EXT-1118 EXT-1119 EXT-1129 EXT-1132 EXT-1135 EXT-1138 EXT-1142 EXT-1161 EXT-1162 EXT-1178 EXT-1180

* NEW DEVELOPMENT:
* EXT-898 - Add dock/undock support for camera and movement controls
* Avatar list changes
* Bottom bar changes: menu, docking, visibility
* Camera changes
* Camera & Movement Floaters
* Dockable Floaters (LLDockableFloater)
* Removed LLListCtrl
* Toast / Notification changes: signal / destruction changes, ordering
* Nearby chat input should display active voice indicator

QA NOTES:
* Message Well Window  is ready to be tested for regression & matching the spec.
* Verify Group List Item L&F
* Verify All tabs in People Panel
* Verify that Picks behavior is not changed

EXT-606

changed make_visible_control="LagMeterShrunk" to visiblity_control="LagMeterShrunk" because the former doesn't exist. Also changed minor spacing issues.
EXT-606

DEV-40528 Viewer 2 floods server with AvatarPropertiesRequest messages causing database load.  Icon cache was only being used to provide images more quickly, not to suppress network traffic.  Made it suppress network traffic, which may result in stale icons occasionally.  Converted online/offline tooltip to use LLAvatarTracker.  Will port to viewer-2-qa-1.  Reviewed with Richard.

DEV-38453 (part4) Modernize and rearrange the nodes of the localized floater_about.xml; NO CHANGES TO ENGLISH.

rewritten the plugin address-splitting to make compilers grumble less and probably more readable.
code by merov, reviewed by moss.

Also reorganize Login menu to the Viewer Design Spec - Top Menus
Also reorganize Debug menu to the Viewer Design Spec - Top Menus

fixes all of the parentheses warnings in the code.

Original patch was reviewed by merov (and others).