1243de5d84
Merge branch 'release/2025.03' of https://github.com/secondlife/viewer
2025-04-03 23:08:03 +02:00
e671cb54fe
#3795 Crash at getVolatileAPRPool()
2025-03-30 13:38:34 +03:00
a17fd2352a
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcharacter/llmotioncontroller.cpp
# indra/llcrashlogger/llcrashlogger.cpp
# indra/llimage/llimagetga.cpp
# indra/llmessage/llregionflags.h
# indra/llprimitive/lldaeloader.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/lltextbase.cpp
# indra/llui/lltexteditor.cpp
# indra/llui/llurlentry.cpp
# indra/newview/llappearancemgr.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llgiveinventory.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llpanelpeople.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelteleporthistory.cpp
# indra/newview/llvocache.cpp
2024-06-09 16:11:24 +02:00
b42f9d836b
Re-enable a lot of compiler warnings for MSVC and address the C4267 "possible loss of precision" warnings
2024-06-01 15:49:26 +02:00
5f1a19af72
Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
...
# Conflicts:
# autobuild.xml
# indra/linux_crash_logger/llcrashloggerlinux.cpp
# indra/newview/llappviewerlinux_api.h
# indra/newview/llappviewerlinux_api_dbus.cpp
# indra/newview/llappviewerlinux_api_dbus.h
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llcallbacklist.cpp
# indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
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
45dc1a63f0
Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llprimitive/lldaeloader.cpp
# indra/llui/lllayoutstack.cpp
# indra/llui/llnotifications.h
# indra/llui/lltoolbar.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloaterimcontainer.cpp
# indra/newview/llfloaterimnearbychathandler.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llpaneloutfitsinventory.h
# indra/newview/llsidepanelappearance.h
# indra/newview/lltoolbarview.cpp
2024-01-12 14:18:34 +01:00
ba74152c82
Replace BOOST_FOREACH with standard C++ range-based for-loops
2024-01-09 20:44:50 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
ebf54d4b2d
Merge with Viewer-VMM
2015-07-15 14:23:19 +02:00
6b8916e760
DD-170 : Handle 503 answer from SLM and added a MARKET_MERCHANT_NOT_MIGRATED state to the UI, showing only the relevant UI to the user (i.e. Merchant Outbox or Marketplace Listings).
2014-10-05 20:17:29 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
5866bb7ef0
merge with release
2014-02-12 10:32:02 -08:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
52ec6f9af0
remove excessively complex fixes for MAINT-2914 and MAINT-3142
2013-11-26 15:09:55 -05:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
f8e5ae8006
MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797)
2013-10-04 14:04:31 +03:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
48f702029f
MAINT-2914 FIXED Mousing over UI elements does not make them light up
2013-08-02 18:00:08 +03:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
7631668abd
Some overall fixing of LLUI, re-adding missing stuff and comments
2013-07-01 00:48:14 +02:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
edeeed9541
CHUI-531 FIXED Poor fps in CHUI viewer
2012-11-21 01:41:49 +02:00
2c5e50f59e
Added optional control checkbox to push buttons, made AO command button use it to switch AO on and off.
2012-02-21 00:37:58 +01:00
bdecd7aa44
Made command list able to use control_name buttons.
2012-02-20 15:10:45 +01:00
7488446f12
Backed out changeset 2d69be4d26b9
...
Clashed with Ansariel's changes
2012-02-20 14:53:19 +01:00
e43e224a4e
Made command list able to use control_name buttons.
2012-02-20 14:49:49 +01:00
4a90d9f3d6
* Moved the name storage on the LLCommandId back to the LLCommand itself.
...
Reviewed by Merov.
2011-10-20 12:40:02 -07:00
aec61c579a
Added 'execute_stop_function' command parameter to handle mouse down/up actions on toolbar buttons
2011-10-11 10:07:19 -07:00
ec5ea33c81
EXP-1300 : drop tool animation. First shot. Works but still a bit hacky and with some bugs (tools can be duplicated at times).
2011-10-09 15:52:45 -07:00
5507840568
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
2011-10-07 10:13:49 -07:00
35d3fa12ba
minor code cleanup
2011-10-07 10:11:20 -07:00
fc5030fcfe
EXP-1286 : Clean-up the mess I added to llcommandmanager. All CommandId now have a trusted UUID which is the base for indexing and comparison.
2011-10-05 22:46:30 -07:00
fb7af4d001
EXP-1202 : pull from richard/viewer-experience-fui
2011-10-05 11:49:12 -07:00
3b3a137073
EXP-1286 : DaD is functional though has bugs... Working on it...
2011-10-05 11:18:17 -07:00
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
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
756532ba8a
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
2011-09-26 17:42:25 -07:00
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
a465f816b8
EXP-1239 FIX make toolbars wrap when there is not enough room
...
toolbars resize to fit buttons
toolbar view uses layout stacks to organize toolbars
reviewed by Leslie
2011-09-26 17:36:07 -07:00
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
412e29ed9d
EXP-1205 PROGRESS -- As a User, I want a toybox which will contain all buttons that I can d&d into the toolbars
...
EXP-1232 FIX -- Create class to load and hold all of the command meta data associated with FUI toolbar actions
* Added basic commands.xml file to define FUI-related toolbar actions. For now
a basic "avatar" and "places" button are defined.
* Added basic command manager to parse and hold strings that define potential
toolbar command actions.
* Broke out a separate floater function as a placeholder for the 3-state toolbar
floater toggling.
* LLUI::initClass now parses the new commands.xml file
Reviewed by Richard.
2011-09-21 17:25:38 -07:00
Ansariel