9a2b83b294
Merge branch 'develop' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llmemory.cpp
# indra/llmessage/CMakeLists.txt
# indra/llmessage/llfiltersd2xmlrpc.cpp
# indra/newview/lldebugview.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llheroprobemanager.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llslurl.cpp
# indra/newview/llsurface.cpp
# indra/newview/lltextureview.cpp
# indra/newview/llversioninfo.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.h
# indra/newview/llviewerwindow.cpp
# indra/newview/llvlcomposition.cpp
# indra/newview/llvoiceclient.cpp
# indra/newview/llworld.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/menu_viewer.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_viewer.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/menu_viewer.xml
# indra/newview/skins/default/xui/ja/menu_viewer.xml
# indra/newview/skins/default/xui/pl/menu_viewer.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/menu_viewer.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/menu_viewer.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/menu_viewer.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/menu_viewer.xml
# scripts/messages/message_template.msg.sha1
2024-07-02 18:08:57 +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
866e71d1f8
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/llappearancemgr.cpp
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgroupactions.cpp
# indra/newview/lltoastalertpanel.cpp
# indra/newview/skins/default/xui/en/floater_preview_gesture.xml
# indra/newview/skins/default/xui/en/panel_group_general.xml
# indra/newview/skins/default/xui/en/panel_group_info_sidetray.xml
# indra/newview/skins/default/xui/en/strings.xml
2023-10-21 13:52:40 +02:00
05acd8a87e
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/lllocationinputctrl.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llslurl.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
# indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2023-10-18 13:42:28 +02:00
e5fc96e299
Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/llviewerassetupload.cpp
# indra/newview/llviewermessage.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-10-12 19:36:10 +02:00
a1f1fb3ff4
[OpenSim] Var Region fixups from Oren @ kitely
2021-05-17 20:35:19 +01:00
ae0598e3f4
FIRE-30939 - remove legacy Inworldz URI support
2021-05-11 22:30:58 +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
1767009246
Improve debug on HG jumps
2020-11-13 20:47:25 +00:00
a0ba493848
Fixed opensim builds
2020-09-19 14:58:32 +02:00
84e05d14a1
Build fix ("hyper" is already defined in some Windows API header)
2018-06-22 22:35:28 +02:00
3af46da957
FIRE-15972: Recognize InWorldz IZURLs properly
2016-06-28 19:32:10 +02:00
c36b189a5a
Transplant MAINT-5127 (FIXED Just remove nonprintable characters from the string.) to OpenSim build
2015-10-16 09:26:01 +02:00
67e008e9b4
Fix email URIs not working on OpenSim builds
2015-08-22 12:30:24 +02:00
caa952e2bc
Use index constants for vector components
2015-08-06 23:06:14 +02:00
272bce84a6
FIRE-16588: Replace llround with ll_round in Firestorm-specific code
2015-08-06 22:56:41 +02:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
0741b35938
FIRE-11586: More hammering on SLURLs; Restore grid manager workaround (the actual start SLURL is set in LLStartup in idle_startup() with state = STATE_AUDIO_INIT)
2014-02-12 16:55:48 +01:00
a386d2eb53
Drop parsing awkward “V3 HG URL” slurls, more slurl clean up
2013-11-07 20:26:19 -07:00
25350e089d
More tidying up for FIRE-11586
2013-11-06 23:59:38 -07:00
cf9dd6eeed
Possible fix for FIRE-11586 on Windows
2013-11-06 23:50:03 -07:00
e34a499292
Clean up slurl code in prep for FIRE-9687 fix
2013-04-08 00:13:50 -06:00
4ca89ec1e3
FIRE-6081: Fix for opening a SLURL in a webbrowser opens a second instance
2013-02-21 13:54:48 +01:00
850c75e818
FIRE-8063: Support giant-sized var region and megaregion teleports
2012-12-16 08:40:24 -07:00
21083349fc
Cannot check in LLSlurl::LLSlurl if getGrid() returns an empty string. That breaks all media.
2012-10-23 14:05:15 +02: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
d0cc27c262
fix FIRE-7044 mapto command in OSgrid does not work
2012-07-24 00:41:04 +02:00
51c8db8756
FIRE-6898 - Explicitly ignore data URI's
2012-07-07 14:02:55 -07:00
d61879d179
better support for hypergrid jumps
2012-06-19 20:32:38 +02:00
66d124ae8b
make opensim support optional at build time
2012-06-15 17:22:40 +02:00
Ansariel