| Age | Commit message (Collapse) | Author |
|---|
|
|
|
|
|
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
|
|
|
|
Busy has been replaced with Do Not Disturb. And both status options have been switched to be indicated with a check rather than alternating text.
|
|
refers to it as Do Not Disturb mode.
|
|
stays in UI. Removed it. Reviewed by Kelly
|
|
|
|
|
|
|
|
characters floater.
|
|
copy, and delete buttons.
|
|
|
|
|
|
removed all references to basic mode
|
|
added close button to destination guide and avatar picker
|
|
|
|
Mini-Location bar are mutually exclusive now
- Implemented context menu for Mini-Location bar (menu_topinfobar.xml)
- Implemented function show_topinfobar_context_menu() (in llviewermenu.h) which displays context menu for Mini-Location bar.
- Functions toggle_show_navigation_panel() and toggle_show_mini_location_panel() modified so that Navigation Bar and Mini-Location bar are mutually exclusive (when the former is visible the latter is hidden and vice versa).
- Implemented method LLPanelTopInfoBar::onContextMenuItemClicked which handles \"landmark\" and \"copy\" Mini-Location bar context menu actions.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/607/
--HG--
branch : product-engine
|
|
initialize edit menu callbacks earlier
|
|
|
|
|
|
Renamed gPie* and menu_pie_* to just gMenu* and menu_* because they are no
longer pie menus. Created separate other-attachment menus.
Reviewed with Richard.
|
|
|
|
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in
the long run this will reduce build time. Also cleaned up a lot of header
file usage to conform better to the coding standard.
reviewed by james and steve.
|
|
|
|
|
|
EXT-2224 : Edit item then delete item -- edit panel still active
EXT-2228 : Buy/Pay/Open buttons for Task sidepanel
--HG--
branch : avatar-pipeline
|
|
We were incorrectly only enabling them for gods. They now properly enable
for region/land owners.
|
|
Changed enable and visible named callbacks to "IsGodCustomerService" so we
have one global function that can be used in menus everywhere.
Reviewed with Leyla.
|
|
EXT-1264 'Zoom in' world context menu opens IM session
reviewed by Richard
|
|
tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
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
|
|
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)
|
|
EXT-404 - Make Debug and Develop menus based on QAMode
Test:
* Advanced menu should be toggled based on ctrl-alt-D (as before)
* 'Advanced > Debug (QA) Mode' (ctrl-alt-Q) should now toggle the Advanced and Debug menus
* God Mode (ctrl-alt-G to enable, ctrl-shift-G to disable) should toggle the 'Admin' menu, but *only* when the 'Advanced' menu is visible
|
|
viewer-2-0
Also:
* Moved media remote shortcut to Communicate menu
* Changed mini map menu to toggle instead of show
|
|
register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
|
|
ignore-dead-branch
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
|
|
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
|
|
incorporating:
QAR-892 Windows installer that pings secondlife.com on launch
QAR-837 Six New Languages in the Installer
QAR-908 downloader-support-1 merge
|
|
dataserver-is-deprecated
|
|
merge 3dconnex-merge -r 84010 : 84039 -> release
|
|
79986 : 80178 -> release.
QAR-290 = QAR-271 + QAR-191
|
|
svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Pick up fixes made to 1.18.6 Viewer, including:
* DEV-8584 Replace "Second Life" with Channel name in viewer crash log reports
* DEV-8384 Connect button doesn't enable
* DEV-8408 Unable to edit First/last name and password fields in viewer login
* DEV-8423 VWR-3948: Underlayers no longer removable by pie menu in Windlight, release candidates
* DEV-8557 Crash on login page when using Logitech LCD Keyboard
* DEV-8507 Crash reporter has no default server to send to when crashing before agent connect
* DEV-8531 viewer_manifest.py broken for 64-bit builds
* DEV-8286 German Translation of the "Release Keys" tab is incorrect
* DEV-7419 Unable to set 'Group Access' for land that is also 'Public Access' (Was VWR-3667)
* DEV-6851 Integrate html error page with client
|
|
|
|
auth merge
|
|
|
|
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
|
|
release
|
|
|
|
|
