Commit Graph

23 Commits (95e44923920fbd57eaeec50ae696aee80405b457)

Author SHA1 Message Date
Andrey Kleshchev d5e8f51b61 #4750 Crash in LLToolBarView::handleDropTool 2025-09-29 22:20:02 +03:00
Ansariel e2e37cced8 Fix line endlings 2024-05-22 22:40:26 +03:00
Ansariel 1b67dd855c Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp
2024-05-22 19:04:52 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel a5261a5fa8 Convert BOOL to bool in llui 2024-02-21 03:00:25 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
maksymsproductengine 01a7002228 MAINT-3163 FIXED Since CHUI, floaters can be moved totally underneath bottom toolbar buttons and "lost". 2013-09-26 00:34:00 +03:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Leslie Linden 948b56e7c2 * Added "clear all" button to the toybox floater with corresponding functions
added to LLToolBarView to perform the action.
* Updated toybox to new height size per XD.
2011-10-31 12:05:56 -07:00
Leslie Linden 8d6e7fa02c * Fixed destination guide floater to display on login based on per account
"DisplayDestinationsOnInitialRun" setting or initial agent SL login.
* Added toolbar enumeration for toolbar view so queries for commands can now
  indicate where the command currently is on the left, right or bottom toolbars.
* Updated toybox toolbar button tooltips to indicate where the command currently
  resides in the view.
* Added unused function to allow toolbar buttons to be changed to flash
  indefinitely.

Reviewed by Richard.
2011-10-24 16:49:00 -07:00
Leslie Linden f3a4a48d8e * Fixed issue where dragging disabled buttons from the toybox to the toybox
would remove them from the surrounding toolbars.
* Removed dead drag & drop code
* Fixed issue where saving didn't necessarily work because toolbar populated
  with command id's that didn't have associated names.
2011-10-19 17:33:10 -07:00
callum 45a3168316 EXP-1337 FIX Add Confirmation dialog to "Restore Defaults" in the Toybox
Reviewed by Leslie
2011-10-12 16:08:53 -07:00
Leslie Linden f9e900f5ac * New floater positioning code. Better than what's checked in but not great.
* Floater updates for positioning and to revert some earlier string changes.
2011-10-11 17:36:23 -07:00
Richard Nelson 0526d67309 EXP-1312 FIX Floaters should appear in region not covered by toolbars
moved floater snap region to middle of toolbars and constrained floaters to that snap region
also made toybox floater pass all drag and drop events along to toolbar
2011-10-10 15:31:25 -07:00
Merov Linden feabe29f35 EXP-1300 : Completed the drawing of drop zones on toolbars when dragging tools 2011-10-07 18:30:57 -07:00
Merov Linden 64d005bfed EXP-1286 : Add DaD to toybox 2011-10-05 17:04:07 -07:00
Leslie Linden db2e763ff0 * Modified commands to add functions for is_enabled, is_running and is_starting,
currently not hooked to any functionality.
2011-10-04 14:09:03 -07:00
Leslie Linden cdc80b1dd3 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1268 FIX -- The "Restore Defaults" button should reset the left/right/bottom toolbars to their default states

* LLToolBarView::loadDefaultToolbars now a static function
* Toybox button callback hooked up to properly restore defaults

Reviewed by Merov
2011-09-30 15:25:02 -07:00
Leslie Linden cf4f436e5b * Updated toybox so it will always display buttons in alphabetical order based
on the localized button labels.
2011-09-29 15:25:24 -07:00
Leslie Linden fdf042bdb9 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1233 FIX -- Populate the toybox floater window with all FUI toolbar buttons indicated as such in the "commands.xml" definition.
EXP-1267 FIX -- Enable/disable buttons in the toybox

* Hooked up button callbacks to the toolbar buttons
* Fixed toybox button enable/disable to function properly and live update as
  buttons change states.
* Removed the toybox toolbar background image

Reviewed by Leyla
2011-09-28 16:54:34 -07:00
Leslie Linden 53a4866493 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
* Command buttons are now enabled/disabled in toybox based on whether or not the
  LLToolBarView has them anywhere.
* Commands now have argument to specify whether or not they should be in the
  toybox.
* LLCommandId is now used a universal reference for commands.

Reviewed by Richard.
2011-09-26 17:38:10 -07:00
Leslie Linden 565483ee1f EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1233 PROGRESS -- Populate the toybox floater window with all FUI toolbar buttons
EXP-1236 FIX -- The toybox floater should remember its position for the user

* Basic addCommand function to the LLToolBar.  Need proper implementation.
* Added map for faster lookup of commands
* Toybox now adds commands to its toolbar for basic button setup

Reviewed by Richard.
2011-09-22 15:43:08 -07:00
Leslie Linden 305b65f6f6 EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
EXP-1210 FIX -- Implement new toybox floater window
EXP-1231 FIX -- Add menu option to toggle the toybox floater on and off

* Basic toybox floater implemented as its own class
* Toybox is available through "Me -> Toolbars..." menu option or ctrl-T shortcut
* Toolbars now have "side" type rather than simple orientation, as well as button
  state for "icons only" or "icons with text".

Reviewed by Richard
2011-09-21 12:11:23 -07:00