Commit Graph

53 Commits (95e44923920fbd57eaeec50ae696aee80405b457)

Author SHA1 Message Date
Ansariel 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
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 7a2070d795 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llui/llsearcheditor.cpp
#	indra/llui/llview.cpp
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloatercamera.cpp
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/lloutfitslist.cpp
#	indra/newview/llpanelgroupbulkban.cpp
#	indra/newview/llscrollingpanelparam.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelappearance.cpp
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llvovolume.cpp
2024-04-24 18:59:46 +02:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
AiraYumi 7c8907522f replace boost library to standard 2024-01-08 23:29:21 +02:00
Mnikolenko Productengine 9e2cdf5cc2 SL-17242 Use proper cap for setting pathfinding attributes 2022-04-20 00:49:58 +03:00
Nat Goodspeed d2c3c2f9fe MAINT-5232: Normalize LLSingleton subclasses.
A shocking number of LLSingleton subclasses had public constructors -- and in
several instances, were being explicitly instantiated independently of the
LLSingleton machinery. This breaks the new LLSingleton dependency-tracking
machinery. It seems only fair that if you say you want an LLSingleton, there
should only be ONE INSTANCE!

Introduce LLSINGLETON() and LLSINGLETON_EMPTY_CTOR() macros. These handle the
friend class LLSingleton<whatevah>;
and explicitly declare a private nullary constructor.

To try to enforce the LLSINGLETON() convention, introduce a new pure virtual
LLSingleton method you_must_use_LLSINGLETON_macro() which is, as you might
suspect, defined by the macro. If you declare an LLSingleton subclass without
using LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() in the class body, you can't
instantiate the subclass for lack of a you_must_use_LLSINGLETON_macro()
implementation -- which will hopefully remind the coder.

Trawl through ALL LLSingleton subclass definitions, sprinkling in
LLSINGLETON() or LLSINGLETON_EMPTY_CTOR() as appropriate. Remove all explicit
constructor declarations, public or private, along with relevant 'friend class
LLSingleton<myself>' declarations. Where destructors are declared, move them
into private section as well. Where the constructor was inline but nontrivial,
move out of class body.

Fix several LLSingleton abuses revealed by making ctors/dtors private:

LLGlobalEconomy was both an LLSingleton and the base class for
LLRegionEconomy, a non-LLSingleton. (Therefore every LLRegionEconomy instance
contained another instance of the LLGlobalEconomy "singleton.") Extract
LLBaseEconomy; LLGlobalEconomy is now a trivial subclass of that.
LLRegionEconomy, as you might suspect, now derives from LLBaseEconomy.

LLToolGrab, an LLSingleton, was also explicitly instantiated by
LLToolCompGun's constructor. Extract LLToolGrabBase, explicitly instantiated,
with trivial subclass LLToolGrab, the LLSingleton instance.

(WARNING: LLToolGrabBase methods have an unnerving tendency to go after
LLToolGrab::getInstance(). I DO NOT KNOW what should be the relationship
between the instance in LLToolCompGun and the LLToolGrab singleton instance.)

LLGridManager declared a variant constructor accepting (const std::string&),
with the comment:
// initialize with an explicity grid file for testing.
As there is no evidence of this being called from anywhere, delete it.

LLChicletBar's constructor accepted an optional (const LLSD&). As the LLSD
parameter wasn't used, and as there is no evidence of it being passed from
anywhere, delete the parameter.

LLViewerWindow::shutdownViews() was checking LLNavigationBar::
instanceExists(), then deleting its getInstance() pointer -- leaving a
dangling LLSingleton instance pointer, a land mine if any subsequent code
should attempt to reference it. Use deleteSingleton() instead.

~LLAppViewer() was calling LLViewerEventRecorder::instance() and then
explicitly calling ~LLViewerEventRecorder() on that instance -- leaving the
LLSingleton instance pointer pointing to an allocated-but-destroyed instance.
Use deleteSingleton() instead.
2016-09-15 20:18:12 -04:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Nat Goodspeed efa9a0f99c Backed out changeset bab1000e1b2d: restore 'selfless' changes 2015-07-10 19:30:10 -04:00
Rider Linden 247eb0c9c3 Backout selfles merge 738255dbbfd679d9e615baab3398e5e345bbb3c5 2015-07-07 19:41:27 +01:00
Nat Goodspeed b262ded7e0 MAINT-5351: Remove 'self' parameter from coroutine functions.
lleventcoro_test.cpp runs clean (as modified for new API), and all the rest
builds clean, but the resulting viewer is as yet untested.
2015-07-01 18:33:29 -04:00
Rider Linden e5c281025d Convert pathfinding api to coro with new LLCore::Http 2015-04-23 13:35:03 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Todd Stinson 685a672b74 Cleaning up new files in preparation for merge into viewer-release. 2012-06-28 15:37:55 -07:00
Todd Stinson 78910cf301 Updating the header licensing comments. 2012-06-26 18:04:19 -07:00
Todd Stinson c9fea8b43c PATH-718: Disabling the view/test menu in the case of a stubbed llphysicsextensions library. 2012-06-25 18:17:56 -07:00
Todd Stinson fb1fa8434a PATH-761: Implementing the new design for the pathfinding view floater. 2012-06-20 19:46:28 -07:00
Todd Stinson 37e6aa609f PATH-723: Pulling in whether the user has access to view the rebake navmesh button or not. 2012-06-19 20:09:35 -07:00
Todd Stinson b98cbe00fe PATH-702: Refining the behavior of the rebuild navmesh button after it is pushed, and removing unused code. 2012-06-19 19:06:25 -07:00
Todd Stinson 37f3a016fc Removing unused methods and members from the pathfinding manager. 2012-06-19 18:29:49 -07:00
Todd Stinson f5a5e687b7 PATH-702: Tying the status of the rebake button to the status of the navmesh for the current region. 2012-06-19 18:13:47 -07:00
prep 6711e6584a path-722: handling the case where region entry or teleporting would cause the rebake button to be drawn ontop of splash screen. 2012-06-19 15:09:22 -04:00
Todd Stinson b59a82fc8e PATH-705: Creating a path to pull in the state of the current region navmesh without downloading the navmesh binary. 2012-06-18 17:21:42 -07:00
prep 43c6d1a247 path-722: At startup we request the agent status update. 2012-06-15 13:00:37 -04:00
prep f6153ab735 WIP: path-722. Some agent_state_updates come through (god mode), region crossings, cleanup logic is a TBD, etc.. 2012-06-14 16:58:11 -04:00
prep 9767b5a026 Path-722: Reset buttons to default state. 2012-06-13 15:31:44 -04:00
prep 7d5c4d20b9 WIP: path-722. Posting and responders for navmesh rebaking 2012-06-13 13:30:26 -04:00
prep de1e1db960 WIP for path-702. 2012-06-13 10:50:46 -04:00
Todd Stinson 42f3648814 PATH-705: First pass at removing the agent state functionality. WIP -- still need to remove XXX_STINSON_AGENT_STATE_DELETE_ME ifdef'ed code. 2012-06-11 18:59:51 -07:00
Todd Stinson e738e704b8 PATH-714: Removing the DEPRECATED_UNVERSIONED_NAVMESH as the viewer no longer has to support the Premium Wilderness regions on the old server code. 2012-06-11 17:03:15 -07:00
Todd Stinson b912c27bf4 PATH-711: Implementing Leo's changes for the pathfinding console. 2012-06-11 16:40:53 -07:00
Todd Stinson ff7223fafe PATH-706: Removing enforcement on frozen/unfrozen state from the linksets floater. Also, removing handlers for agent state change. 2012-06-11 14:45:59 -07:00
Todd Stinson 3352a1eac1 Cleaning up some unreferenced headers and classes definitions from previous refactoring. 2012-05-30 19:39:08 -07:00
Todd Stinson 3c2be426e5 First pass at refactoring the pathfinding linksets and pathfinding characters classes to reduce code duplication, as both functionalities were heavily duplicated. 2012-05-30 18:47:12 -07:00
Todd Stinson 84d8b320a2 PATH-580: Ensuring that the characters and linksets capability services are properly deferred requested in the case that a regions capabilities have not been fully received at initial request time. 2012-05-01 14:55:53 -07:00
Todd Stinson 852377c676 Switching the functionality of the linksets and character request handling to no longer return values directly, but rather to report status only through the callbacks. 2012-05-01 14:22:58 -07:00
Todd Stinson 9329217667 PATH-585: Adding an initial notification for when a server-side automatic unfreeze occurs. 2012-04-27 17:08:33 -07:00
Todd Stinson a72034fa42 PATH-580: BUGFIX Adding functionality to detect when the region's capabilities have not yet been loading and deferring requests for the navmesh query until the capabilities are fully loaded. 2012-04-24 19:23:20 -07:00
Todd Stinson 9d22b22d96 PATH-482: BUGFIX Automatically reloading the character and linksets floaters on region crossing. 2012-04-05 15:59:34 -07:00
Todd Stinson 473da43c1b Refactoring the characters floater code. 2012-03-27 19:05:29 -07:00
Todd Stinson d4fb7c99fe PATH-302: Adding in status reporting for the simulator navmesh status. Separating the viewer status messaging from the simulator status. 2012-03-14 14:09:36 -07:00
Todd Stinson e1aac37181 PATH-394: First pass at handling the sim-to-viewer message reporting the change from FROZEN to UNFROZEN state. 2012-03-13 16:42:07 -07:00
Todd Stinson b3197fc12e PATH-304: Making the navmesh version information work for both Premium Wilderness regions (old pathfinding simulator build with missing capabilities) as well as the new pathfinding simulator builds with the version services. 2012-03-12 18:48:40 -07:00
Todd Stinson f578181af9 PATH-304: Adding functionality to handle the reloading of out-of-date navmeshes. 2012-03-08 12:34:11 -08:00
Todd Stinson a0c626fe41 PATH-205,PATH-304: More work to handle downloading of out-of-date navmeshes. 2012-03-06 18:40:37 -08:00
Todd Stinson a33e24413e PATH-304,PATH-205: Initial reworking of the navmesh download functionality. 2012-03-02 19:17:16 -08:00
Todd Stinson 1503338ddc PATH-292: Ensuring that the terrain linkset is not visible and/or editable to a non-estate non-god agent. 2012-02-27 16:15:16 -08:00
William Todd Stinson 9b06300e2c PATH-292: Adding the ability to view and edit pathfinding attributes of the terrain. 2012-02-25 22:27:06 -08:00
Todd Stinson 73aa47f391 PATH-292: Reworking how and where linksets are requested and managed. 2012-02-23 16:51:06 -08:00