livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,385 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

1157 Commits (353329c2c2e9e8fa1ff273de2016c9e155585f45)

Author SHA1 Message Date
Dave Houlton 353329c2c2 DRTVWR-546 merge in master v6.5.1 2021-11-16 11:44:55 -07:00
Dave Parks 68b75be652 SL-9436 Don't render 100% transparent objects. 2021-10-28 22:09:22 +00:00
Andrey Lihatskiy b18f328c08 Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 
# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
 2021-09-03 00:18:26 +03:00
Andrey Kleshchev 08e31fc642 SL-15729 Using gMenuLand instead of gMenuHolder 
These UI elements belong to gMenuLand, "Buy Land..." no longer exists
 2021-07-30 21:55:35 +03:00
Andrey Kleshchev 6de3a7f91d SL-15729 Crash calling childSetEnabled 2021-07-30 09:07:36 +03:00
Andrey Lihatskiy 6c8e6f033b Merge branch 'master' into DRTVWR-521-maint 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llerror.cpp
#	indra/llui/llnotifications.h
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewermacosx.cpp
 2021-07-20 02:48:05 +03:00
Andrey Lihatskiy 2ded530f93 Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappcorehttp.cpp
#	indra/newview/llappcorehttp.h
 2021-07-19 22:20:45 +03:00
Andrey Lihatskiy 7f19c512c9 Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
 2021-06-25 00:54:35 +03:00
Andrey Lihatskiy 293272c2c7 Merge branch 'master' into DRTVWR-521-maint 2021-06-25 00:52:03 +03:00
Andrey Lihatskiy a4c6c7059f Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llvoicevivox.cpp
 2021-06-25 00:51:02 +03:00
Andrey Kleshchev 79f8c024c3 SL-15363 how_to on older viewers is forced to persist 
Older how_to floater is not set to persist in between sessions and gets stuck, ranamed new how_to into guidebook to avoid the issue
 2021-06-09 19:48:19 +03:00
Andrey Lihatskiy e00edbeb4a Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	doc/contributions.txt
 2021-04-30 03:04:06 +03:00
Andrey Lihatskiy e5a428f362 Merge branch 'master' into DRTVWR-521-maint 2021-04-30 03:00:32 +03:00
Andrey Kleshchev 3f31901640 Merge master (DRTVWR-515) into DRTVWR-516-maint 
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/llcoros.cpp
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/llfloaterimsessiontab.cpp
 2021-04-29 21:00:25 +03:00
Andrey Lihatskiy c54382b760 Merge branch 'master' into DRTVWR-518-ui 
# Conflicts:
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/skins/default/xui/en/strings.xml
 2021-04-29 20:04:33 +03:00
Andrey Kleshchev 8cd5d7c58a SL-14906 More adjustments to guidebook 
The Guidebook should remember it's open/closed state between sessions.
The Guidebook button should show as pressed while the Guidebook is open.
 2021-04-17 00:36:10 +03:00
Andrey Kleshchev 3780c86538 SL-15028 Move guidebook code into own flaoter 
To help with dispatcher and unify code
 2021-04-16 01:24:29 +03:00
Andrey Kleshchev 4c889f7e52 Merge branch 'master' (DRTVWR-514) into DRTVWR-518-ui 
# Conflicts:
#	indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034
 2021-04-01 21:34:44 +03:00
Andrey Lihatskiy b52384d9ef Merge branch 'master' into DRTVWR-522-maint 
# Conflicts:
#	indra/newview/lltoolpie.cpp
 2021-04-01 20:49:26 +03:00
Andrey Lihatskiy e355f47d28 Merge branch 'master' into DRTVWR-521-maint 2021-04-01 20:48:28 +03:00
Andrey Lihatskiy 9fe758e8bc Merge branch 'master' into DRTVWR-516-maint 2021-04-01 20:45:16 +03:00
Andrey Lihatskiy 6240168f24 Merge branch 'master' into DRTVWR-515-maint 2021-04-01 20:45:06 +03:00
Andrey Kleshchev 309fb9e892 SL-15034 Revisions to dedicated Avatar menus 2021-03-29 23:36:55 +03:00
Mnikolenko Productengine 33eadba6ef SL-15028 Guidebook floater 2021-03-25 18:57:30 +02:00
Mnikolenko Productengine d43d8bc68b SL-14900 new Landmark creation flow 2021-03-23 17:38:22 +02:00
Andrey Kleshchev 4076208a72 SL-14961 Bugsplat logging 2021-03-12 00:25:53 +02:00
Andrey Kleshchev 14826e17dc SL-14654 [EEP] Aplying settings locally now is instant 
The 1 second fade makes it harder to compare different settings.
 2021-02-25 23:48:48 +02:00
Andrey Kleshchev 18717562ee SL-14654 [EEP] Aplying settings locally now takes 1 second insterad of 5 2021-02-19 00:05:52 +02:00
Andrey Lihatskiy fad8c596d4 Merge branch 'master' into DRTVWR-522-maint 2021-02-17 21:24:04 +02:00
Andrey Lihatskiy 57c560fa0e Merge branch 'master' into DRTVWR-521-maint 2021-02-17 21:23:31 +02:00
Andrey Lihatskiy 003f396d2f Merge branch 'master' into DRTVWR-514-keymappings 2021-02-17 21:22:22 +02:00
Andrey Lihatskiy 59092d052f Merge branch 'master' into DRTVWR-518-ui 2021-02-17 21:21:55 +02:00
Andrey Lihatskiy 976ece3807 Merge branch 'master' into DRTVWR-516-maint 2021-02-17 21:21:21 +02:00
Andrey Lihatskiy ba8dcf906d Merge branch 'master' into DRTVWR-515-maint 2021-02-17 21:20:08 +02:00
Andrey Kleshchev 44b6459dfa Merge branch 'master' into DRTVWR-514-keymappings 
# Conflicts:
#	indra/llui/llscrolllistctrl.cpp
 2021-02-01 23:33:41 +02:00
Andrey Kleshchev 609a26b59a Merge branch 'master' of https://bitbucket.org/lindenlab/viewer/src/master into DRTVWR-515-maint 
# Conflicts:
#	autobuild.xml (llca)
#	indra/llwindow/llwindow.h (SL-13507 vs SL-5894)
#	indra/newview/llscenemonitor.cpp (SL-14422)
#	indra/newview/llvovolume.cpp (SL-12069)
 2021-02-01 22:28:15 +02:00
Brad Payne (Vir Linden) 665598a5ba Merge remote-tracking branch 'origin/master' into DRTVWR-517 2021-02-01 20:20:33 +00:00
Andrey Lihatskiy f047e2236c Merge branch 'master' into DRTVWR-522-maint 2021-02-01 22:14:56 +02:00
Andrey Lihatskiy 185082f1bb Merge branch 'master' into DRTVWR-521-maint 
# Conflicts:
#	indra/newview/llappviewer.cpp
 2021-02-01 22:14:44 +02:00
Andrey Lihatskiy 2cf9c01175 Merge branch 'master' into DRTVWR-518-ui 2021-02-01 22:11:35 +02:00
Andrey Lihatskiy cd831c4228 Merge branch 'master' into DRTVWR-516-maint 2021-02-01 22:11:04 +02:00
Mnikolenko Productengine 300f6f8b8e Revert "SL-13463 Add 'Reset scripts' button to Content tab of Build floater" 2020-11-26 14:45:30 +02:00
Mnikolenko Productengine 1a7ca0ac71 SL-14366 Close empty script actions floater 2020-11-24 16:21:05 +02:00
Andrey Lihatskiy 7d93032f08 Revert "SL-13479 Dedicated top-level menu for avatar editing" 
This reverts commit ca6bb3506d.
 2020-11-24 04:20:15 +02:00
Andrey Lihatskiy 7f236cd2ae Revert "SL-13479 Avatar menu tweaks" 
This reverts commit 05ce7511aa.
 2020-11-24 04:20:06 +02:00
Mnikolenko Productengine 94cd34cc17 SL-13479 Avatar menu tweaks 2020-11-24 04:17:45 +02:00
Mnikolenko Productengine 8f8d26a770 SL-13479 Dedicated top-level menu for avatar editing 2020-11-24 04:17:27 +02:00
Andrey Lihatskiy ac3db22abc Merge branch 'master' into DRTVWR-518-ui 2020-11-13 18:27:29 +02:00
Andrey Lihatskiy fb1238a1ce Merge branch 'master' into DRTVWR-516-maint 
# Conflicts:
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.cpp
#	indra/newview/llenvironment.cpp
 2020-11-13 18:26:56 +02:00
Andrey Lihatskiy 0bba892bb0 Merge branch 'master' into DRTVWR-515-maint 
# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
 2020-11-13 18:22:43 +02:00