f82e171a30
Merge branch 'release/2025.04.1' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/commands.xml
# indra/newview/llfloateravatarwelcomepack.cpp
# indra/newview/llfloateravatarwelcomepack.h
# indra/newview/llstartup.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2025-06-13 19:39:16 +02:00
088cc2ea35
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llpointer.h
# indra/llcommon/llqueuedthread.cpp
# indra/llfilesystem/llfilesystem.cpp
# indra/llui/llconsole.cpp
# indra/llui/llkeywords.cpp
# indra/llui/llstatgraph.cpp
# indra/llui/llvirtualtrackball.cpp
# indra/newview/llagentcamera.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloateremojipicker.cpp
# indra/newview/llfloaterimnearbychathandler.cpp
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersnapshot.cpp
# indra/newview/llglsandbox.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llpanelface.cpp
# indra/newview/llpanelpermissions.cpp
# indra/newview/llpanelplaceprofile.cpp
# indra/newview/llstartup.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/llvocache.cpp
# indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +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
04c76e96ab
Fix for OSX build (clang finding multiple overloads for operator==).
2022-05-25 20:58:51 +02:00
06bde96503
FIRE-30562 [OPENSIM] Add GridStatus support
2022-05-25 02:52:37 +01:00
f53410d4ee
FIRE-30593 - Cannot download grid info after TP
2021-02-13 15:25:06 +00:00
86d5c30f1b
Fix SL builds...
2020-11-15 18:50:55 +01:00
dc8d291c9f
FIRE-10549 - [OPENSIM] Further HG uniformity checks
...
fixes a specific case of manually typed URIs being treated as http links.
adds additional debug for further testing
refactors ambiguous function name gridURL()
2020-11-15 16:46:06 +00:00
4bf29ac974
FIRE-10549 etc. part one of a potentially larger change to come later
...
This fixes the hop grid name issue. The expectation is that an HG grid has a valid GridURL parameter in the OpenSim extras, if not the home grid will be used as normal. Extensions to this such as map copy slurl, and other places may follow in a future release but require more investigation.
2020-11-06 19:57:04 +00:00
8bb6fbf8f0
FIRE-29279 - [OpenSim] Allow region configurable max prim size
2020-10-29 15:56:41 +00:00
f0b781173e
Add an ignorable alert modal each time that the currency URI changes.
2017-12-12 08:11:47 +00:00
658d08aed5
Change SignaledTyped signal to pass the new value to the callback method
2017-12-07 00:00:14 +01:00
24edb1e6ff
Minor fixes for previous commit
2017-09-30 19:01:47 +02:00
4ad7d4b750
Support for multiple currency solutions on a grid and across the hypergrid.
2017-09-20 16:00:25 -07:00
50f328ac49
FIRE-16857: Implement SimulatorFPS[...] sim-feature handler for OpenSim to fix lag meter
2015-11-30 12:06:41 +01:00
05dfa7bb98
Small optimization: Don't always check the string length
2015-11-20 14:57:32 +01:00
bd120d745c
OpenSim: Handle (most) OpenSimExtras caps in LFSimFeatureHandler and access map server, search, destination guide and avatar picker URLs via LFSimFeatureHandler
2015-11-20 12:13:15 +01:00
67fceb3ef8
Small round of clean up:
...
* Remove unused includes
* Fix a case of improper declared method
* Fixed a few cases of variable redefintions
2015-05-09 12:20:04 +02:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
01855fabc7
Refactor OpenSimExtras to use lfsimfeaturehandler with permission from Liru Færs
2013-10-07 23:33:07 -06:00
Ansariel