40c627172b
More banging at selection beams
2024-10-28 16:52:48 +01:00
6e7da8eaa8
GCC is whining again...
2024-10-28 16:38:34 +01:00
b03525d025
Fix crash when opening selection beam floaters via SLURL
2024-10-28 12:06:35 +01:00
82e8fd1671
Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/skins/default/xui/en/notifications.xml
2024-09-09 19:50:00 +02:00
8c4c9fbe96
Put everything in FSCommon into the namespace with the same name
2024-09-06 14:29:02 +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
3d00f56ea0
Move unescaped_name function to FSCommon
2020-06-16 20:09:04 +02:00
3a132c0344
FIRE-22869: Fix lockup due to undefined behavior as a result of division by zero
2018-08-08 19:38:45 +02:00
272bce84a6
FIRE-16588: Replace llround with ll_round in Firestorm-specific code
2015-08-06 22:56:41 +02:00
217e879c20
Linux: fstream has no constructor that takes a std::string.
2015-05-06 16:34:41 +02:00
a443eb7bcb
More poking at and refactoring of LGG's beams stuff
2014-08-07 22:56:13 +02:00
0f5a8c6aa8
More refactoring of LGG's beams code:
...
* Don't use magic "===OFF===" filename for disabling things
* Made missing strings localizable
* Use typedefs instead of int directly
* Use iterators for vectors where it makes sense
2014-08-07 15:02:59 +02:00
07e7ab87ba
Cleaned up LGG's beams code
2014-04-22 00:29:53 +02:00
d00f764e2a
Attempt to speed up things a little
2013-01-13 23:08:22 +01:00
42bf7138ea
Small tweakage and cleanup in beam maps code
2011-12-25 15:21:25 +01:00
65185139cc
First sweep of changes for settings (and a few functions) from Phoenix prefix to FS.
2011-10-10 06:10:45 +02:00
7a96dae97e
Re-license my beam code to the wtfpl.
2011-07-23 01:59:56 -05:00
b5476e2e3d
License Changes for Beam effects files. gpl->lgpl
2011-06-30 07:47:04 -05:00
bea506dfaa
Fixing a bug with colors introduced unintentionally (hopefully)
2011-06-30 14:02:30 +02:00
563f4fc2b8
Fixing crash in particle effect beams due to missing overloaded operator.
...
Minor improvements to beam floaters and XUI cleanup.
2011-06-30 09:59:20 +02:00
3f2cf42eb0
Ported Selection Beam Particle Effects from Phoenix by LordGregGreg Back (licensed LGPL w/ permission)
2011-06-29 23:21:38 +02:00
Ansariel