2f42e999e0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llhudtext.cpp
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelprofile.cpp
2022-08-31 16:04:49 +02:00
4d5b5a5ae3
Enable c++17 since it seems LL is hesitant to finally do it...
2022-08-11 21:56:48 +02:00
fc11575657
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 20:28:29 +02:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
35cec6e3ad
Initialize PODs with 0 and not leave anyting to chance.
2022-02-28 22:20:41 +01:00
f46a15b3f3
Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
2022-01-11 15:04:11 +01:00
4966a66219
SL-16297 Init mObscureMOAP flag
2021-12-20 16:26:11 +02:00
2112abac1b
SL-16297 Support the parcel obscure_moap flag.
2021-12-17 18:13:20 +02:00
160f44375e
Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer
2021-10-12 12:59:35 +02:00
adcd08fbf4
Revert "Merge branch 'c++17' into DRTVWR-522-maint"
...
This reverts commit 203ea3a70a8e3f077886
2021-09-28 19:22:18 +03:00
f2cd97a055
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-31 14:49:52 +02:00
26fb5d7af7
SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.
2021-05-07 20:32:04 -04:00
c699f816d1
Merge viewer-eep
2018-11-16 00:22:32 +01:00
77b278b7f5
SL-9620 Viewer crashes after clicking "Commit" button while editing Day Cycle preset
2018-11-12 16:41:40 +02:00
1733550573
Merge viewer-eep
2018-09-22 00:42:04 +02:00
b50d546d5f
MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
...
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
0bf50e2f8c
Cleanup on daycyle selection and stack. Move blenders into environment.
...
(Transition bronken, instant only. Shaddows moved based on region, not parcel)
2018-01-30 16:42:34 -08:00
fbd8a98300
Selects correct day cycle. Fix an error validating legacy daycycles.
2018-01-25 17:21:25 -08:00
a0c228d842
MAINT-8052: Report if the returned environment is the default.
2018-01-16 11:03:26 -08: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
4ce6691cf8
Merge viewer-xp_tools
2015-06-25 11:57:17 +02:00
48fc17d6e1
Merge LL V3.7.16
2015-01-14 17:36:30 +01:00
f9113c286f
Merge
2014-10-09 16:10:00 -07:00
4c7b0cb528
ACME-1459: Experience tab added to the about land tab for editing parcel Experiences
2014-05-16 15:52:39 -07:00
48fece4473
Merge with 3.7.7-release
2014-05-07 11:14:26 -07:00
a5568f942b
Merge downstream version 3.7.8 code
2014-05-07 15:28:13 -07:00
155399cb71
parcel experience lists can be manipulated through the ParcelAccessListUpdate
...
message
2014-05-01 13:56:45 -07:00
b1cffda8f3
MAINT-2361 FIXED One and the same user shown in Allowed and in Banned Residents lists
2014-04-23 19:47:19 +03:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
17e9c872ad
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-11-11 19:17:49 -08:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
edf2b52cb2
MAINT-3082 : Remove unused viewer LLParcel code
2013-09-03 17:18:59 -07:00
9f7bfa1c37
moved unit types out of LLUnits namespace, since they are prefixed
2013-08-15 00:02:23 -07:00
26581404e4
BUILDFIX: added header for numeric_limits support on gcc
...
added convenience types for units F32Seconds, etc.
2013-08-14 11:51:49 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
d27fc4ad33
MAINT-2257 : Create ability to limit region/estate and parcel access by
...
either Piof or Group membership (viewer changes). Using Mnikolenko's patch
2013-08-07 15:56:29 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
b04e00b2a3
Fix a few implicit double to float conversions, pedanticly add a few missing function prototypes
2013-07-28 14:41:32 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
fe04921c21
MAINT-1601 Land remains for sale after purchasing for group.
...
reviewed with Simon
2012-09-21 13:32:25 -07:00
f138120086
FIRE-7773: Corrected parcel category for search; "Any" is apparently only valid for searches but not as parcel category
2013-02-23 02:22:41 +01:00
169263d8b0
Merge LL 3.4.5 beta 3
2013-01-28 01:56:00 -08:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
03e9a7c69f
C_ANY is -1 of course and not C_COUNT + 1
2012-10-26 12:17:38 +02:00
caa7215881
FIRE-7773 / MAINT-1686: Fix for parcel categories don't stay selected
2012-10-26 10:22:52 +02:00
070c722631
storm-1843: remove unused ParcelMediaURLFilter code
2012-06-11 12:20:09 -07:00
b9247373fb
Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup of old code related to earlier accounting work.
2011-08-02 17:01:46 -04:00
918238dd18
ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
...
Privacy" changes. Many naming changes for the featureto be "See avatars"
instead of "hidden avatars". Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
2011-07-01 14:06:08 -07:00
Ansariel