9b93864eb9
Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llstartup.cpp
# indra/newview/llurldispatcher.cpp
# indra/newview/llvieweraudio.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
06b56944af
Add some comment with example SLURL for "addgrid"
2022-11-14 12:34:02 +01:00
d149a3b782
FIRE-31628 Use OpenSim collision sounds when in OpenSim
2022-05-10 15:13:10 +01:00
01d644f95f
Splash page is https ready thanks to BUG-216465 being fixed
2021-09-02 19:36:36 +02:00
cbddc4a71b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-12 01:59:17 +02:00
ae0598e3f4
FIRE-30939 - remove legacy Inworldz URI support
2021-05-11 22:30:58 +01:00
4ec90e0320
Add "gridmanager" SLURL app command to add new grids to grid manager via SLURL
2021-05-04 23:26:50 +02:00
335e9e1363
Fix local variable scoping issue
2020-11-12 01:35:45 +00:00
926c4fecea
SUP-26198 - Grid list "freezes" when adding grid
2020-11-07 01:47:01 +00:00
face468d7b
FIRE-24068 support https grid info URIs
2020-11-07 01:23:18 +00:00
5fdcea0963
Exclude local grid file variable declaration if SINGLEGRID is defined
2018-09-30 21:32:55 +02:00
f4c2ed2103
Add build option to allow logging into a single grid only:
...
* Specify -DSINGLEGRID:BOOL=TRUE and -DSINGLEGRID_URI:STRING=<grid_uri> during configuration
* Only works for OpenSim build (Specify -DOPENSIM:BOOL=TRUE)
Changes compared to default version:
* Grid at <grid_uri> is set as main grid
* Grid selector on login screen is disabled
* Grid list download is disabled
* Grid list is ignored - grid data is always fetched on startup
* OpenSim panel from preferences is removed
* Grid selection via command line parameter is ignored
2018-09-30 21:29:26 +02:00
429ea6c37d
Fix grid manager to include last modified date in request where it apparently should and handle status 304 response properly (and internal server errors presumably as well)
2018-06-13 17:06:55 +02: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
2aeb2d2e65
Merge Firestorm LGPL
2016-10-10 21:42:22 +02:00
969220f324
FIRE-20112; Delay grid initialization until grid manager is ready.
2016-10-06 00:07:21 +02:00
bcb564a29e
Keep profileuri as synonym for web_profile_url for the gridlist in case we download them
2016-09-20 12:39:54 +02:00
8114953694
Rename grids.fallback.xml to grids.xml and clean up fsgridhandler on the way
2016-09-20 12:38:44 +02:00
c13d5c4072
Merge viewer-bear
2016-09-20 11:44:19 +02:00
9de9b58013
Add FSCoreHttpUtil to the project
2016-08-06 16:54:22 +02:00
3af46da957
FIRE-15972: Recognize InWorldz IZURLs properly
2016-06-28 19:32:10 +02:00
785662ba04
Change Gridhandler http code to support the new http-coroutine methods.
2015-11-01 17:57:00 +01:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
cfc3d0ce8f
A collection of fixes provided by Cinder Roxley
2015-02-28 17:35:52 +01:00
42755bac49
Don't write warnings about invalid grid to the log before the grid manager is initalized
2015-02-18 11:33:05 +01:00
b51b8035b4
Post-merge curl fixing
2014-10-22 03:21:14 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
81cb25bc30
Use same grid labels for OS and havok versions
2013-11-17 00:21:43 -07:00
0eaeb2fe34
Fix command line loginuri on opensim version
2013-11-07 23:49:33 -07:00
4d0597a6e7
A little code cleanup in fsgridhandler
2013-11-07 20:13:10 -07:00
94327cee99
Remove some unused GridInfo entries
2013-06-25 22:44:34 -06:00
578ef533ad
FIRE-10620: Fix isInSecondLife() from incorrectly returning true.
2013-06-13 17:05:57 -06:00
bcc9e83a25
FIRE-10567: Support for upcoming OpenSim definable classified ads fee. Move check from GridInfo to login response.
2013-06-11 21:24:53 -06:00
a6bba1f286
FIRE-9814: Don't hardcode a minimum listing fee for classifieds on non-sl platforms.
2013-04-26 08:04:21 -06:00
3a02cfbe37
Fix FIRE-9613 & FIRE-9621
2013-04-02 14:33:03 -06:00
1f30846fb2
Updates to grid manager: Show advanced info but hide the ability to edit it by hand for now.
2013-03-30 13:13:41 -06:00
1a81af53e4
Replace silly grid bools with a grid platform enum
2013-02-09 12:01:39 -07:00
d145a7701f
FIRE-8063: Add Open Region Settings panel to the Region Info floater for aurora-sim; Add IsInAuroraSim() to fsgridhandler
2012-10-28 14:23:32 -06:00
3e13995a3d
FIRE-8046: Support for Aurora Sim Var region - Adapted from Angstrom Viewer with thanks to nhede Core and Revolution Smythe. Also adds support for certain other aurora-sim features which still need some work.
2012-10-28 08:03:39 -06:00
3140e9be74
FIRE-7610 [CRASH] Entering a non valid region name at login screen causes crash at launch on subsequesnt runs
2012-10-22 21:39:48 +02:00
09b561dadd
fix FIRE-7468 Destinations + Choose Avatar floaters are broken
2012-08-31 21:05:31 +02:00
01c7d1eafb
Merge LL pathfinding
...
with help from Armin and NickyD
2012-08-06 18:14:39 -07:00
07745f2a4b
fix handling of grid entries marked as deprecated in the fallback list
2012-08-03 19:28:09 +02:00
c855c065cb
make CURRENT_GRID a default substitution, fixes FIRE-2935
2012-06-30 17:57:51 +02:00
ce344b0c2a
fix FIRE-6738
2012-06-25 14:03:55 +02:00
d5932a602c
add UI for removing and refreshing grid entries to prefs > Opensim
2012-06-24 12:19:56 +02:00
dcbab3d4b3
add "Add grid" option to prefs > opensim
2012-06-21 15:34:49 +02:00
9d541a9a68
fix commandline loginuri (partial fix of FIRE-3448)
2012-06-21 00:23:01 +02:00
d61879d179
better support for hypergrid jumps
2012-06-19 20:32:38 +02:00
Ansariel