17952fb45f
FIRE-30937: Fix build when building with neither FMOD nor Havok
2021-05-05 11:48:14 +02:00
a0be0371d7
Merge branch 'DRTVWR-513-maint' of https://bitbucket.org/lindenlab/viewer
2020-11-12 01:12:13 +01:00
842d84b8ec
Fix for RelWithDebInfoOS build
2020-11-04 22:17:33 +02:00
a72e1418ad
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-501
2020-06-24 12:12:46 +02:00
ea54dd6ea5
Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer
2020-06-17 15:52:16 +02:00
7eece4447c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-16 20:42:32 +02:00
b49a3ca18f
[FIXED] Poor people without Havok and FMOD want to build the viewer too
2020-06-15 20:57:41 +02:00
0722de4f24
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-12 22:45:00 +02:00
aabb0bbc49
SL-13390 Disable Havok icon when Havok is not included
2020-06-11 16:47:27 +03:00
846d0d3371
SL-13390 Fix Openal Builds
2020-06-05 17:25:51 +03:00
0bad9728cd
Fix build when not building with FMOD Studio
2020-06-03 16:48:03 +02:00
b80e8b2eae
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-03 08:49:50 +02:00
363e9c949b
Merge branch 'master' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/viewer_manifest.py
2020-06-02 23:15:38 +03:00
dfb5aa549f
Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer
2020-05-28 21:13:04 +02:00
1fe92a9df9
SL-13340 Restored status display for login
2020-05-28 18:22:17 +03:00
2e238f0ba8
SL-12665 Readjusted all logos
2020-05-28 17:17:54 +03:00
36c27bf5ec
SL-12664 readjusted logo #2
2020-05-28 15:34:56 +03:00
205546730e
SL-12664 readjusted logo
2020-05-28 12:09:08 +03:00
c47516c442
SL-12607 Reverted to original logos
2020-05-28 11:25:04 +03:00
4b761c9b96
Tweak login progress
2020-04-23 19:41:15 +02:00
f22474724e
Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/newview/llprogressview.cpp
# indra/newview/viewer_manifest.py
2020-04-23 19:36:46 +02:00
de17c53ae3
SL-12607 Removed spacer
2020-04-16 17:34:29 +03:00
c49e9baa48
SL-12607 Rearrange login panel
2020-04-15 22:52:28 +03:00
032c4a1b49
SL-12607 WIP, take pre-sized icons from repo instead of package
2020-04-14 21:32:10 +03:00
17053311e0
Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer
2020-04-14 00:34:11 +02:00
347c53855b
SL-12607 Added more icons and draw methods to draw them
2020-04-13 22:41:55 +03:00
bc91debfd7
Merge branch 'DRTVWR-508' of https://bitbucket.org/lindenlab/viewer
2020-04-10 18:37:27 +02:00
6b203f2ee4
SL-12607 FMOD Logo
2020-03-19 21:39:05 +02:00
e0727702ea
Merge branch 'DRTVWR-501' into trunk
2020-02-03 15:18:34 +02:00
09ff4dba7a
Merge viewer-neko
2019-12-14 10:38:06 +01:00
57050ea2a7
SL-12198 Log source of quit command
2019-12-06 17:39:00 +02:00
d79b79fbe2
Merge viewer-ordered-shutdown
2019-10-19 03:16:10 +02:00
8369276a49
DRTVWR-493 LLViewerMedia to singleton
2019-06-21 20:55:39 +03:00
2797c5938a
Merge Firestorm LGPL
2016-04-05 10:47:23 +02:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
c218e524b2
Merge - Step 1; Still enough to do.
2015-10-26 20:20:13 +01:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
290524e871
MAINT-5614: Cancel the fade timer for the progress screen when hidding progress.
2015-09-29 15:57:50 -07:00
2efb0c3eca
Prepare for NUI login page merge phase 1: Move the current login page into the FS domain
2015-01-14 23:13:24 +01:00
3d1ac7c0ec
Merge LL 3.7.3 (Viewer-Bear fixes)
2014-03-17 14:14:15 -07:00
e6c85c46c4
MAINT-3555 crash in LLPanel::~LLPanel() on shutdown:
...
- memory leaks fixing;
2014-02-05 20:45:09 +02:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
c418d61627
CHUI-667 Upon exit from DND mode, a maximum of one sound should be played. Solution. Added a deferred sound class which will have sound id's added to it and upon unmuting the deferred sounds will be played.
2013-01-25 17:47:36 -08:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
686c7faf7a
MAINT-117 FIXED Login screen didn't hide if you minimized viewer window right after pressing "Log In".
2012-04-03 18:33:42 +03:00
991d43709c
merge LL 3.3.3 beta
2012-06-16 07:22:27 -07:00
161c1b019f
Merge up from 24496 / a656486925e8 (FS tip) to 25952 / 931cb0061118 (V/Dev FUI tip)
...
Observations and broken stuff so far:
- LLSideTray is gone.
- LLBottomTray is gone.
- LLFloaterSnapshot was changed and gave lots of merge conflicts. Flickr upload will be broken.
- LLNearbyChat is derived from LLPanel now. That broke quite some stuff rearding autohiding and docking of chatbar.
- Profile floaters are gone and all web based now.
- Russian translation gave huge mere conflicts with the new russian xml files from LL. Unmergeable. I took the LL files.
- XUI files in general will need some love and testing.
2012-01-17 17:57:52 +01:00
7c95af74f1
SH-2243 work in progress -- application side matrix stack management
2011-09-14 16:30:45 -05:00
Ansariel