Commit Graph

66 Commits (6393e88ca47998fc5dfae3ce2fc2fd41bf568f49)

Author SHA1 Message Date
Ansariel ea83746cda Remove orphaned VRAM handling code 2024-06-17 19:04:41 +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
Alexander Gavriliuk f9473e8afc secondlife/viewer#1333 BOOL to bool conversion leftovers: ternaries 2024-05-07 10:18:51 +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 c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +02:00
Andrey Kleshchev a2971d84d5 Viewer#779 Make RenderMaxVRAMBudget more consistent 2024-02-15 19:31:41 +02:00
Brad Linden 369945b45d Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539 2023-04-26 15:38:47 -07:00
Dave Parks b5db671f7c SL-18682 WIP -- Add debug settings that aid in emulating low end hardware. 2022-11-29 09:15:02 -06:00
Mnikolenko Productengine ba9bff5b9b SL-17541 Show the message that user is currently at maximum FPS 2022-06-08 01:21:42 +03:00
Mnikolenko Productengine 768b7a4d33 SL-16330 Clean up vertical sync handling, add to UI 2021-11-09 17:17:49 +02:00
Callum Linden 851fef6801 SL-16102 Set window title to agent name (child of SL-15999 Support for low overhead, non interactive viewer sessions) 2021-09-28 15:24:42 -07:00
Andrey Lihatskiy 8c3b468531 Merge branch 'master' into DRTVWR-515-maint 2020-07-21 11:54:25 +03:00
Mnikolenko ProductEngine 4d27b11a16 SL-13507 Viewer should log resolution of all associated displays 2020-07-20 17:09:04 +03:00
Mnikolenko Productengine 44906ac0d4 SL-13507 Viewer should log resolution of all associated displays 2020-07-17 20:28:02 +03:00
Nat Goodspeed de4a0b8f5b DRTVWR-494: Avoid keeping iterator to destroyed temporary container. 2020-03-25 15:28:17 -04:00
Nat Goodspeed 9d5b897600 DRTVWR-494: Defend LLInstanceTracker against multi-thread usage.
The previous implementation went to some effort to crash if anyone attempted
to create or destroy an LLInstanceTracker subclass instance during traversal.
That restriction is manageable within a single thread, but becomes unworkable
if it's possible that a given subclass might be used on more than one thread.

Remove LLInstanceTracker::instance_iter, beginInstances(), endInstances(),
also key_iter, beginKeys() and endKeys(). Instead, introduce key_snapshot()
and instance_snapshot(), the only means of iterating over LLInstanceTracker
instances. (These are intended to resemble functions, but in fact the current
implementation simply presents the classes.) Iterating over a captured
snapshot defends against container modifications during traversal. The term
'snapshot' reminds the coder that a new instance created during traversal will
not be considered. To defend against instance deletion during traversal, a
snapshot stores std::weak_ptrs which it lazily dereferences, skipping on the
fly any that have expired.

Dereferencing instance_snapshot::iterator gets you a reference rather than a
pointer. Because some use cases want to delete all existing instances, add an
instance_snapshot::deleteAll() method that extracts the pointer. Those cases
used to require explicitly copying instance pointers into a separate
container; instance_snapshot() now takes care of that. It remains the caller's
responsibility to ensure that all instances of that LLInstanceTracker subclass
were allocated on the heap.

Replace unkeyed static LLInstanceTracker::getInstance(T*) -- which returned
nullptr if that instance had been destroyed -- with new getWeak() method
returning std::weak_ptr<T>. Caller must detect expiration of that weak_ptr.

Adjust tests accordingly.

Use of std::weak_ptr to detect expired instances requires engaging
std::shared_ptr in the constructor. We now store shared_ptrs in the static
containers (std::map for keyed, std::set for unkeyed).

Make LLInstanceTrackerBase a template parameterized on the type of the static
data it manages. For that reason, hoist static data class declarations out of
the class definitions to an LLInstanceTrackerStuff namespace.

Remove the static atomic sIterationNestDepth and its methods incrementDepth(),
decrementDepth() and getDepth(), since they were used only to forbid creation
and destruction during traversal.

Add a std::mutex to static data. Introduce an internal LockStatic class that
locks the mutex while providing a pointer to static data, making that the only
way to access the static data.

The LLINSTANCETRACKER_DTOR_NOEXCEPT macro goes away because we no longer
expect ~LLInstanceTracker() to throw an exception in test programs.
That affects LLTrace::StatBase as well as LLInstanceTracker itself.

Adapt consumers to the new LLInstanceTracker API.
2020-03-25 15:28:17 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
AndreyL ProductEngine 078612e292 MAINT-5019 FIXED Additional cases 2015-07-14 04:39:20 +03:00
Oz Linden a98b4b6bee merge changes for 3.7.7-release 2014-05-07 11:09:04 -04:00
Ricky Curtice e9116575bf OPEN-209: Corrected all instances of trigraphs in the code.
Trigraphs can cause some real special headaches.  The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
Richard Linden e340009fc5 second phase summer cleaning
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Richard Linden 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
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Maestro Linden a567c425ca MAINT-536 MAINT-1913 Added missing URL scheme filtering to the Linux viewer, changed URL scheme whitelist. Reviewed by Callum. 2012-11-14 02:24:58 +00:00
Richard Linden f4a122b6d7 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience 2012-02-23 12:40:27 -08:00
Richard Linden 9da67fff0a EXP-1832 FIX Viewer Size not persistent across logins
made Set Window Size correctly set interior window rect, preserving measured dimensions
2012-02-23 12:39:32 -08:00
Seth ProductEngine a5e4b15b7d Linux build fix.
Moved type casts from protected base classes to derived LLCoord.
2012-02-23 21:02:46 +02:00
Richard Linden f27ea1aff7 EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
2012-02-07 22:50:49 -08:00
Seth ProductEngine ed431700ed EXP-1756 FIXED setting user defined window size via floater Window Size. 2011-12-30 22:31:19 +02:00
Richard Linden dd9263d017 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-08 11:02:00 -08:00
Leslie Linden 1df7627921 EXP-1675 POTENTIAL FIX -- Changed default min window width and height to 0 instead of max size.
Reviewed by Richard.
2011-12-07 16:37:51 -08:00
Ansariel 1e2d424f9e STORM-1713: Mouse pointer flickers when hovering over any active/clickable UI item 2011-12-05 23:35:29 +01:00
Leslie Linden ef0552a090 EXP-1642 FIX -- Viewer crash on startup on Mac
Minimum window size setting no longer forces propagation to the OS before root view is initialized.
2011-12-02 12:33:51 -08:00
Richard Linden 20221c8e77 EXP-1485 FIX -- Viewer should have a minimum size
moved min size logic into LLWindow
2011-11-28 12:51:15 -08:00
callum e4e4977f5e EXP-1527 FIX Debug values for windowwidth and windowheight can be set below minimum required values
and
EXP-1528 Launching viewer with a settings.xml file with windowwidth and windowheight set below minimum values, launches to those values not minimum window size
2011-11-11 12:29:04 -08:00
Nat Goodspeed 79f14b7feb CHOP-763: Move llwindowlistener.{h,cpp} from llwindow to newview.
Instantiate LLWindowListener on LLViewerWindow instead of on LLWindow.
This permits LLWindowListener to use machinery from llui, e.g.
LLUI::resolvePath().
Document planned new ["path"], ["reply"] params to "keyDown", "keyUp",
"mouseDown", "mouseUp", "mouseMove" operations; document relationship between
["path"] and ["x"] and ["y"].
NEW PARAMS NOT YET IMPLEMENTED.
2011-08-25 14:54:38 -04:00
Nat Goodspeed 3f3429fa68 STORM-1051: Fixup to LLWindowListener per code review.
Bug: capturing a const ref to value returned by LLSD::asString() not so good.
Bug: LLWindowListener::keyUp() was calling handleTranslatedKeyDown().
In keyDown and keyUp, support keysym lookup (e.g. "TAB") as well as integer
keycode.
In keyDown, keyUp, mouseDown, mouseUp and mouseMove, support modifier mask by
accepting an array of "CONTROL", "SHIFT" etc. strings.
State in operation doc strings valid values for button, keycode, keysym, mask.
The LLWindowListener(... LLKeyboard*) constructor param gKeyboard is always
NULL at the time LLWindowListener is constructed. Eliminate tests and global
references to gKeyboard by replacing with a more Feathers-style LLKeyboard*
getter function.
2011-03-21 17:38:16 -04:00
brad kittenbrink 930710ceec Added an EventAPI listener to LLWindow for hooking into key and mouse inputs. 2011-02-17 15:50:44 -08:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Igor Borovkov c67bc96278 Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run)
by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux."

--HG--
branch : product-engine
2010-03-18 16:31:09 +02:00
Eugene Mutavchi 48fd4c8d14 Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux.
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +00:00
Christian Goetze 1aa0416aef svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/featurettes/featurettes-batch5-merge
Melinda (coco): 5th and final batch of featurettes. My work here is done.
2009-03-13 21:28:40 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts d725e5b240 QAR-872 Viewer 1.21 RC 3
merge viewer_1-21 96116-97380 -> release
2008-09-29 19:14:50 +00:00
Steven Bennetts afe61eb994 QAR-849 merge maint-viewer-10-merge 96838-97237 -> release 2008-09-23 01:53:11 +00:00
Steven Bennetts da94c0eaa2 QAR-855 Viewer 1.21 RC 2
merge viewer_1-21 94770-96059 -> release
2008-09-12 06:27:13 +00:00
Steven Bennetts 80be4c1d2d QAR-767 Combined maint-render-7 and maint-viewer-9 merge
merge release@93398 viewer-merge-1@94007 -> release
dataserver-is-deprecated
2008-08-12 17:29:50 +00:00