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
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
9dc3651d0c
Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/lltexlayer.cpp
# indra/llappearance/lltexlayer.h
# indra/llappearance/lltexlayerparams.cpp
# indra/llappearance/llwearabletype.cpp
# indra/llcharacter/llbvhloader.cpp
# indra/llcharacter/llbvhloader.h
# indra/llcharacter/llcharacter.cpp
# indra/llcharacter/llcharacter.h
# indra/llcharacter/lljoint.h
# indra/llcharacter/llvisualparam.cpp
# indra/llfilesystem/lldir_win32.cpp
# indra/llfilesystem/lldir_win32.h
# indra/llinventory/llparcel.cpp
# indra/llmath/llmath.h
# indra/llmath/llvolume.cpp
# indra/llmessage/lldatapacker.h
# indra/llxml/llxmltree.h
# indra/newview/CMakeLists.txt
# indra/newview/llagentwearables.cpp
# indra/newview/llagentwearables.h
# indra/newview/lldirpicker.cpp
# indra/newview/llphysicsmotion.cpp
# indra/newview/llviewergesture.cpp
# indra/newview/llviewerjointattachment.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexlayer.h
# indra/newview/llvoavatarself.cpp
# indra/newview/llvoavatarself.h
2024-02-18 00:09:57 +01:00
e43634d8c3
Add @getdebug_aspectratio to return the viewer window's AR (helper for @setoverlay)
2021-01-16 16:04:12 +01:00
7256da3e34
RLVa string constants rework (part 2)
2020-09-16 01:56:47 +02:00
fbd23878fc
Rewrite all @setenv related commands against the new atmospherics/environment class
2020-04-19 14:12:00 +01:00
17687f7701
Comment out all @setenv related commands to get the viewer up and running again
2020-03-21 16:49:24 +01:00
6bfbd8d2fa
Merged with default tip (Revision f4406f7e1f99)
...
--HG--
branch : RLVa
2017-03-13 10:09:51 +01:00
e4f327e747
Code cleanup: integrate some of the Firestorm changes/fixes so we don't wipe them out again
...
--HG--
branch : RLVa
2016-06-24 16:58:17 +02:00
75e217b82e
Code review: RLVa extensions are no longer optional features
...
-> @accepttprequest will auto-accept all incoming teleport requests (allows exceptions - see @accepttp)
-> @allowidle (stays experimental - subject to change)
-> @getcommand:<filter> can be used to discover which commands are part of the user's RLVa implementation (with user-defined separator)
-> @findfolders:<filter> works like @findfolder but will return all matches (with user-defined separator)
-> @getdebug:<setting> can be used to query (but not set) the "RestrainedLoveforbidGiveToRLV", "RestrainedLoveNoSetEnv" and "WindLightUseAtmosShaders" debug settings
-> @interact will block world interaction but allows drag-drop, the camera tool, mouse steering and access to the "self" context menu
-> @sharedwear is the counterpart of @unsharedwear and wear locks the shared #RLV folder
-> @sharedunwear is the counterpart of @unsharedunwear and remove locks the shared #RLV folder
-> @touchhud will prevent the user from touching/clicking on their HUD attachments (allows exceptions)
-> @tprequest will prevent the user from requesting teleports (allows exceptions - see @tplure)
-> force wear commands will activate/deactivate gestures as well
-> force wear commands will collect from folder links as well
-> [FIXED] Location on incoming teleport requests isn't censored when @showloc restricted
-> [FIXED] Message on outgoing teleport offers isn't censored when @startim restricted
-> [FIXED] Message on outgoing teleport requests isn't censored when @sendim or @startim restricted
--HG--
branch : RLVa
2016-04-10 14:07:23 +02:00
ffeee4889e
- internal : RLVa files #include clean-up
...
--HG--
branch : RLVa
2015-06-25 17:04:02 +02:00
f1e09a95f2
Merged with default tip (Revision 0568de92960a)
...
--HG--
branch : RLVa
2013-09-02 11:30:14 +02:00
5c29ca72f4
- internal : post-merge fix
...
--HG--
branch : RLVa
2012-04-28 15:19:24 +02:00
693753c465
- fixed : silly GCC errors (thankies Mistress)
...
--HG--
branch : RLVa
2011-11-17 17:09:06 +01:00
a47c2185c3
- fixed : @setenv_preset:<name>=force and @setenv_daycycle:<name>=force don't change the current sky preset or day cycle
...
--HG--
branch : RLVa
2011-09-04 23:48:57 +02:00
e8d4c2f5f0
- internal : rewrite of the @getenv_XXX and @setenv_XXX Windlight commands
...
--HG--
branch : RLVa
2011-08-30 00:02:57 +02:00
74aff082df
Merged with .RLVa tip
...
--HG--
branch : RLVa
2011-08-06 20:06:42 +02:00
c80812fb9f
- internal : header dependency cleanup for rlvcommon.h and rlvhandler.h
...
--HG--
branch : RLVa
2011-05-22 11:34:34 +02:00
c55f28def1
- internal : updated copyright year
...
--HG--
branch : RLVa
2011-05-21 23:10:45 +02:00
70921ec06d
- fixed : assertion failure in RlvHandler::notifyCommandHandlers()
...
-> repro: execute a @setdebug_XXX/setenv_XXX:<option>=force command while another object already holds the @setdebug/setenv restriction
-> eRet would remain at RLV_RET_UNKNOWN and trigger the "(fContinue) || (eRet != RLV_RET_UNKNOWN)" assertion
--HG--
branch : RLVa
2010-12-09 02:53:35 +01:00
86102778c1
- internal : the issuing object's UUID is stored in the RlvCommand so it no longer needs to be passed around as a separate parameter
...
--HG--
branch : RLVa
2010-08-30 14:16:53 +02:00
33997d0695
- internal : moved several rlvXXX helper and RlvHandler member functions into an RlvUtil helper class
...
--HG--
branch : RLVa
2010-08-29 04:00:55 +02:00
b6a073c659
Initial commit of RLVa-1.2.0i
...
--HG--
branch : RLVa
2010-08-22 10:57:22 +02:00
Ansariel