Callum Prentice
|
8631a7a077
|
Merge with tip of Master after a Viewer release
|
2021-07-19 14:35:44 -07:00 |
|
Callum Prentice
|
99b99a1b4a
|
Clean up a merge conflict
|
2021-04-29 13:45:15 -07: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 |
|
Callum Prentice
|
168d177197
|
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
|
2021-03-09 14:39:51 -08:00 |
|
Andrey Lihatskiy
|
ec824a16d5
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-03-09 21:57:53 +02:00 |
|
Andrey Lihatskiy
|
bb17e4b78e
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-03-09 21:56:14 +02:00 |
|
Brad Payne (Vir Linden)
|
c83e740ef9
|
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
|
2021-03-08 13:56:16 +00:00 |
|
Andrey Lihatskiy
|
135d54a4ff
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-03-02 21:41:37 +02:00 |
|
Andrey Lihatskiy
|
35550e36db
|
Merge branch 'master' into DRTVWR-515-maint
|
2021-03-02 21:41:26 +02:00 |
|
Callum Prentice
|
d26567915c
|
Merge with Master after Viewer release
|
2021-02-03 09:31:32 -08: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 |
|
Andrey Lihatskiy
|
cd831c4228
|
Merge branch 'master' into DRTVWR-516-maint
|
2021-02-01 22:11:04 +02:00 |
|
Mnikolenko Productengine
|
3b4bd86a1d
|
SL-14182 remove old script asset file after saving changes and allow renaming files if destination file exists
|
2020-10-27 16:46:31 +02:00 |
|
Mnikolenko Productengine
|
61e27e0f6c
|
SL-14050 remove references to viewer-help
|
2020-10-23 21:13:18 +03:00 |
|
Andrey Kleshchev
|
56e427d0eb
|
SL-13995 User Friendly Script Name In External Editor Tab
|
2020-09-28 19:54:00 +00:00 |
|
Callum Prentice
|
6be1f88a5e
|
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
|
2020-09-24 14:45:39 -07:00 |
|
Callum Prentice
|
2e6f516411
|
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
|
2020-09-16 21:12:53 -07:00 |
|
Callum Prentice
|
3fc07dea01
|
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
|
2020-09-16 18:53:24 -07:00 |
|
Andrey Kleshchev
|
6afefa31df
|
SL-13691 wstring index was used for normal string
|
2020-08-03 20:59:21 +03:00 |
|
Dave Houlton
|
dc1453af9c
|
Merge in from viewer-release 6.3.5
|
2019-11-13 16:46:27 -07:00 |
|
Graham Linden
|
3609eabe54
|
Merge viewer-release 6.3.2
|
2019-09-10 12:07:01 -07:00 |
|
andreykproductengine
|
37eb735ba7
|
Merged in lindenlab/viewer-release
|
2019-09-10 20:30:25 +03:00 |
|
andreykproductengine
|
c61d0f4297
|
DRTVWR-493 LLUI to LLParamSingleton
|
2019-08-10 15:31:03 +03:00 |
|
maxim_productengine
|
4af78ca09e
|
SL-11121 FIXED Viewer crashes after clicking the 'Edit' button in the notecard floater
|
2019-05-09 15:19:37 +03:00 |
|
maxim_productengine
|
584a05797d
|
SL-10782 External edit button for Notecards
|
2019-04-03 10:58:35 +03:00 |
|
Rider Linden
|
56c773b3bc
|
Merge
|
2018-08-03 16:19:47 -07:00 |
|
Rider Linden
|
f07dc421e8
|
Merge
|
2018-06-21 09:13:19 -07:00 |
|
maxim_productengine
|
31bfc7ff47
|
MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose upload files within the first minute
|
2018-05-30 18:31:30 +03:00 |
|
Rider Linden
|
3888de9439
|
Merge
|
2018-05-22 13:16:37 -07:00 |
|
maxim_productengine
|
0e9c0e0daf
|
MAINT-8716 Script name should be passed to "Save to file" dialog.
|
2018-06-04 12:21:10 +03:00 |
|
Rider Linden
|
b766466b30
|
Added settings inventory object with subtype
|
2018-02-26 09:27:14 -08:00 |
|
Mnikolenko Productengine
|
df45a4ef14
|
MAINT-7732 Crash in LLLiveLSLEditor::loadScriptText(..)
|
2018-01-16 16:08:08 +02:00 |
|
Rider Linden
|
b37eb2642f
|
Remove delete preset dialog, Initial settings for selection level (Region/Parcel/Local)
|
2017-11-10 16:17:25 -08:00 |
|
andreykproductengine
|
f8254a9d78
|
MAINT-7758 Fixed freeze on loading lsl scripts from unicode named windows folder.
|
2017-08-30 19:57:02 +03:00 |
|
Mnikolenko Productengine
|
e46f66ff31
|
MAINT-7752 FIXED Crash in LLPreviewNotecard::handleSaveChangesDialog
|
2017-08-25 17:02:33 +03:00 |
|
Mnikolenko Productengine
|
d775f9b63d
|
MAINT-7732 FIXED Crash in LLLiveLSLEditor::loadScriptText
|
2017-08-23 18:45:45 +03:00 |
|
Mnikolenko Productengine
|
9e8464d5d9
|
MAINT-7650 FIXED Crash in LLPreviewLSL::saveIfNeeded(bool)
|
2017-07-28 17:03:23 +03:00 |
|
Mnikolenko Productengine
|
5e926ece20
|
MAINT-7245 Use Experience Box in LSL Editor will not show as checked if containing object is in another region
|
2017-03-30 16:30:01 +03:00 |
|
Mnikolenko Productengine
|
bcadc2c1b3
|
MAINT-1660 Don't hide script editor floater immediately after removing script from inventory.
|
2016-07-29 17:53:33 +03:00 |
|
Ansariel
|
adf4b727c2
|
Fix further merge error in LLLiveLSLEditor::draw()
|
2016-04-14 14:03:43 +02:00 |
|
Ansariel
|
77ef10e049
|
OPEN-292: More removal of orphaned legacy script upload methods
|
2016-04-07 10:04:05 +02:00 |
|
Ansariel
|
e25e95b10e
|
Fix old merge issue in LLLiveLSLEditor::draw()
|
2016-04-05 11:28:43 +02:00 |
|
Oz Linden
|
9be58e915a
|
merge with 4.0.3-release
|
2016-04-04 15:53:09 -04:00 |
|
Rider Linden
|
b8c1976460
|
Merge
|
2016-03-17 13:14:21 -07:00 |
|
Oz Linden
|
31f3db0291
|
merge changes for DRTVWR-417
|
2016-03-16 13:08:06 -04:00 |
|
Oz Linden
|
867ef882fd
|
merge changes for OPEN-292
|
2016-02-07 13:41:41 -08:00 |
|
Mnikolenko ProductEngine
|
5099d01b74
|
MAINT-1017 FIXED Disable checkbox during saving process to avoid glitch.
|
2015-12-21 11:37:31 +02:00 |
|
Cinder Biscuits
|
cc235cdcc4
|
Merged lindenlab/viewer-tools-update into default
|
2015-11-29 20:14:22 -07:00 |
|
Oz Linden
|
c8726aba30
|
remove execute permission from many files that should not have it
|
2015-11-10 09:48:56 -05:00 |
|
Rider Linden
|
53b947e039
|
Merge from viewer release.
|
2015-10-19 12:03:08 -07:00 |