4e0ad8a758
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/doxygen/CMakeLists.txt
# indra/llcommon/indra_constants.h
# indra/llmath/llmath.h
# indra/llmath/llvolume.cpp
# indra/llmath/v3dmath.h
# indra/llmath/v4color.h
# indra/llui/llchatentry.cpp
# indra/llui/llchatentry.h
# indra/llui/llfloater.h
# indra/llui/llkeywords.h
# indra/newview/llpanelprimmediacontrols.cpp
# indra/newview/llpanelsnapshotinventory.cpp
# indra/newview/llpanelsnapshotlocal.cpp
# indra/newview/llpanelsnapshotoptions.cpp
# indra/newview/llpanelsnapshotpostcard.cpp
# indra/newview/llpreviewscript.h
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/de/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/de/panel_snapshot_options.xml
# indra/newview/skins/default/xui/en/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/es/panel_snapshot_options.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/fr/panel_snapshot_options.xml
# indra/newview/skins/default/xui/it/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/it/panel_snapshot_options.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/ja/panel_snapshot_options.xml
# indra/newview/skins/default/xui/pl/panel_snapshot_options.xml
# indra/newview/skins/default/xui/ru/panel_snapshot_options.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_inventory.xml
# indra/newview/skins/default/xui/zh/panel_snapshot_options.xml
2025-04-18 19:56:20 +02:00
9c3ce3dec7
Clean up LLUI and fix/add suggestions from VS ( #2746 )
...
# Conflicts:
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.h
# indra/llwindow/llwindowsdl.cpp
2025-04-18 01:45:11 +02:00
e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
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
0ecfbc3de9
Merge remote-tracking branch 'LGPL/master'
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llappearance/llwearable.cpp
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llmessage/tests/llmockhttpclient.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.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/llgroupactions.cpp
# indra/newview/llimpanel.cpp
# 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/llpaneleditwearable.cpp
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# 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/llviewermenu.cpp
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
2024-05-16 14:10:55 +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
d0102af56d
Merge branch 'main' of https://github.com/secondlife/viewer into DRTVWR-600-maint-A
...
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llselectmgr.cpp
# indra/newview/lltranslate.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
2024-04-11 21:59:38 +02:00
0dd4b94ef0
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llapp.cpp
# indra/llcommon/llapp.h
# indra/llcommon/llpointer.h
# indra/llimage/llimageworker.cpp
# indra/llui/llcontainerview.cpp
# indra/llui/llcontainerview.h
# indra/llui/llkeywords.cpp
# indra/llui/lltabcontainer.cpp
# indra/llui/lltextbase.cpp
# indra/llwindow/llwindowwin32.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfavoritesbar.h
# indra/newview/llfloaterpreference.cpp
# indra/newview/llhudnametag.h
# indra/newview/llinventorypanel.cpp
# indra/newview/llinventorypanel.h
# indra/newview/llmeshrepository.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llpanelprofilepicks.cpp
# indra/newview/llpanelvoicedevicesettings.h
# indra/newview/llpreviewscript.cpp
# indra/newview/llpreviewscript.h
# indra/newview/llscrollingpanelparam.cpp
# indra/newview/llselectmgr.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/en/panel_performance_complexity.xml
# indra/newview/skins/default/xui/en/panel_performance_huds.xml
2024-04-10 12:32:32 +02:00
210f59a923
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/llfloater.cpp
# indra/llui/llfloater.h
# indra/llui/llfolderview.h
# indra/llui/llfolderviewitem.cpp
# indra/llui/llmenugl.cpp
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llstatbar.cpp
# indra/llui/lltabcontainer.h
# indra/llwindow/lldxhardware.cpp
# indra/llwindow/lldxhardware.h
# indra/llwindow/llkeyboard.cpp
# indra/llwindow/llkeyboard.h
# indra/llwindow/llkeyboardheadless.cpp
# indra/llwindow/llkeyboardheadless.h
# indra/llwindow/llwindow.h
# indra/llwindow/llwindowmacosx.cpp
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowsdl.cpp
# indra/llwindow/llwindowsdl.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/llavatarlist.cpp
# indra/newview/llavatarlistitem.h
# indra/newview/llchatitemscontainerctrl.cpp
# indra/newview/llchiclet.cpp
# indra/newview/llfasttimerview.cpp
# indra/newview/llfavoritesbar.cpp
# indra/newview/llfloaterbvhpreview.cpp
# indra/newview/llfloatermap.cpp
# indra/newview/llnavigationbar.cpp
# indra/newview/llnavigationbar.h
# indra/newview/llnetmap.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/lltoolcomp.cpp
# indra/newview/lltoolcomp.h
# indra/newview/lltoolface.cpp
# indra/newview/lltoolfocus.h
# indra/newview/lltoolpie.cpp
2024-02-18 16:22:54 +01:00
c285f59ce2
Replace BOOL with bool in llwindow and dependent classes
2024-02-18 15:51:54 +02:00
4ef7d45e4d
Merge branch 'DRTVWR-588-maint-W' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llpaneleditwearable.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
2023-09-06 18:24:58 +02:00
57d784f807
SL-18620 Statistics->Advanced->Memory Usage no longer updating
2023-08-24 20:47:26 +02:00
730b8427b5
SL-16329 - track frame time and jitter (as average deviation frame to frame) in stats window
2021-11-19 14:43:19 -05:00
63cc972499
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llappearance/lldriverparam.h
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llrender/llvertexbuffer.cpp
# indra/llwindow/llwindow.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawable.cpp
# indra/newview/lldrawable.h
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpooltree.cpp
# indra/newview/lldrawpoolwater.cpp
# indra/newview/llface.cpp
# indra/newview/llinventoryfilter.cpp
# indra/newview/llselectmgr.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llvieweroctree.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
# indra/newview/llvowlsky.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
ca0b9a3753
SL-16329 - track frame time and jitter (as average deviation frame to frame) in stats window
2021-11-09 20:25:25 +00: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
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
5c0dcb4a72
Update to build on Xcode 6.0: collection of removal of unused const variables [-Wunused-const-variable] and member variables
2014-10-17 20:44:43 -07:00
000f430eb4
Fix stat bars in statistics floater not remembering their state anymore
2014-06-27 10:45:34 +02:00
ea2494a083
stats now autoscale back down in range, instead of sticking at high water mark
2013-10-30 00:37:11 -07:00
17df8988fe
renamed TraceType to StatType
...
added more MemTrackable types
optimized memory usage of LLTrace some more
2013-10-07 13:38:03 -07:00
0dfc08d22a
BUILDFIX: more bad merge stuff
...
also added ability for statbar to show memtrackable info
2013-09-19 15:21:46 -07:00
2c6bc5afa5
SH-4433 WIP Interesting: Statistics > Ping Sim is always 0 ms
...
made getPrimaryAccumulator return a reference since it was an
always non-null pointer
changed unit conversion to perform lazy division in order to avoid truncation
of timer values
2013-08-21 14:06:57 -07:00
9faaa28f44
SH-4346 FIX Interesting: some integer Statistics are displayed as floating point after crossing region boundary
...
fine-tuned heuristics for switching between mean and current values in stat bar display
added comments to LLUnits unit test
2013-08-13 18:33:07 -07:00
cc31b4ae79
SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue bounces once per second
...
SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary
made llerrs/infos/etc properly variadic wrt tags
LL_INFOS("A", "B", "C") works, for example
fixed unit tests
remove llsimplestat
2013-08-12 20:05:16 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
c95042db3e
SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics console
...
improved calculation of display range for stat bars
2013-07-12 00:52:31 -07:00
d122318bef
SH-4299 WIP: Interesting: High fps shown temporarily off scale in statistics console
...
added percentage/ratio units
added auto-range and auto tick calculation to stat bar to automate display stats
2013-07-08 00:55:17 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
233201f822
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
removed unnecessary templates from accumulator types...now always
track data in double precision floating point, using templated accessors to
convert to and from arbitrary types
2013-06-02 22:49:17 -07:00
9ae76d1215
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
fixed copy construction behavior of Recordings to not zero out data
split measurement into event and sample, with sample representing
a continuous function
2013-05-29 17:00:50 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
935dce7d6b
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
fixed some compile errors
made label spacing automatic on stat bars
fixed infinite values coming from stats
2013-03-25 00:18:06 -07:00
1f507c3cfc
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
copied over scene load frame differencing changes from viewer-interesting
made periodicrecording flexible enough to allow for indefinite number of periods
added scene loading stats floater
fixed collapsing behavior of container views
2013-03-21 00:37:20 -07:00
8de397b19e
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
7b4d27ecbc
SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
...
collapsed Orientation enums to all use LLView::EOrientation
added ability to display stat bar horizontally
2013-03-14 19:36:50 -07:00
9d77e030d9
SH-3406 WIP convert fast timers to lltrace system
...
cleaning up build
moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc
streamlined Time class and consolidated functionality in BlockTimer class
llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-11-14 23:52:27 -08:00
67ec47e6da
SH-3406 WIP convert fast timers to lltrace system
...
moving fast timers into lltrace namespace and accumulation system
2012-11-13 17:10:10 -08:00
74fe126590
SH-3405 FIX convert existing stats to lltrace system
...
output of floater_stats is now identical to pre-lltrace system (with some tweaks)
2012-11-01 17:52:11 -07:00
819adb5eb4
SH-3405 FIX convert existing stats to lltrace system
...
final removal of remaining LLStat code
2012-11-01 00:26:44 -07:00
a52d203a4f
SH-3405 WIP convert existing stats to lltrace system
...
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
2012-10-17 20:00:07 -07:00
041dfccd1e
SH-3405 WIP convert existing stats to lltrace system
...
default to double precision now
fixed unit conversion logic for LLUnit
renamed LLTrace::Rate to LLTrace::Count and got rid of the old count as it was confusing
some const correctness changes
2012-10-12 20:17:52 -07:00
0f58ca02cd
SH-3275 WIP Update viewer metrics system to be more flexible
...
cleaned up accumulator merging logic
introduced frame recording to LLTrace directly instead of going through LLViewerStats
moved consumer code over to frame recording instead of whatever the current active recording was
2012-10-12 00:20:19 -07:00
14b1b0b2bb
SH-3275 WIP Run viewer metrics for object update messages
...
cleaned up API
samplers are now value types with copy-on-write buffers under the hood
removed coupling with LLThread
2012-10-01 19:39:04 -07:00
b1baf982b1
SH-3275 WIP Run viewer metrics for object update messages
...
factored out lltrace::sampler into separate file
added rudimentary lltrace support to llstatgraph
made llstatgraph use param blocks more effectively
moves initial set of stats over to lltrace
removed windows.h #defines for min and max
2012-09-30 10:41:29 -07:00
b3e9c46c94
SH-3275 WIP Run viewer metrics for object update messages
...
further cleanup of LLStat
removed llfloaterlagmeter
2012-08-29 22:50:56 -07:00
b183b6f141
EXP-1196 FIX Fix param block template ordering
...
changed ordering of template loading relative to constructor setting of params
moved a lot of constructor-set params to template files
reviewed by Leslie
2011-09-06 14:45:11 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Ansariel