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

44 Commits (1aaa765d269f546dcc45cccb1f40077e3015304f)

Author SHA1 Message Date
Ansariel 25f974d77d Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-03-01 10:00:36 +01:00
Nicky 2a03afe85c Make GCC shut up about some warnings 2022-02-10 22:06:05 +01:00
Ansariel 603e04ee3c Merge branch 'DRTVWR-540-maint' of https://bitbucket.org/lindenlab/viewer 2021-08-24 13:18:55 +02:00
Nat Goodspeed a9b82b9d89 SL-15393: Use non-overloaded name for function returning LLSD&. 2021-06-24 02:07:40 +03:00
Ansariel 93f1998a47 Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer 2021-01-08 23:06:41 +01:00
Dave Houlton 7cd076c796 DRTVWR-510 remove all LL_SOLARIS conditionals 2020-10-08 17:16:22 -06:00
Ansariel 350cf703a1 Merge branch 'DRTVWR-501-maint' of https://bitbucket.org/lindenlab/viewer 2020-07-24 00:44:20 +02:00
Dave Houlton 19d063952c Merge master 6.4.6 into DRTVWR-510 
Includes the conversion to VS2017 build tools.
 2020-07-21 11:04:56 -06:00
Andrey Lihatskiy 7bbf3f5f7f Merge branch 'master' into DRTVWR-501-maint 
# Conflicts:
#	autobuild.xml
#	indra/newview/llimprocessing.cpp
 2020-07-20 22:24:10 +03:00
Brad Kittenbrink bbee0658c3 Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4 2020-07-14 19:53:57 +03:00
Nicky Dasmijn cff453ff51 Merge remote-tracking branch 'eep/master' into fs-eep-vs2017 2020-05-20 13:49:20 +02:00
Nat Goodspeed ca6f092929 DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72 2020-05-06 16:06:26 -04:00
Brad Kittenbrink 11e9fbefeb Fixed -Wstring-plus-int related errors for compatibility with Xcode-11.4 2020-04-17 10:31:01 -06:00
Nat Goodspeed e6a9523d27 SL-11216: Allow llsd::drill() to accept LLSD() as (empty) path. 
Before this change, you had to literally pass LLSD::emptyArray() to get no-op
behavior.
 2020-03-25 16:05:09 -04:00
Nat Goodspeed a2379d6871 SL-11216: Add llsd::drill() function to drill into an LLSD blob. 
We include both const and non-const overloads. The latter returns LLSD&, so
you can assign to the located element.

In fact we already implemented the non-const logic in a less public form as
storeToLLSDPath() in lleventcoro.cpp. Reimplement the latter to use the new
llsd::drill() function.
 2020-03-25 16:01:31 -04:00
Nat Goodspeed 16ef497e18 SL-11216: Allow llsd::drill() to accept LLSD() as (empty) path. 
Before this change, you had to literally pass LLSD::emptyArray() to get no-op
behavior.
 2019-05-31 16:36:14 -04:00
Nat Goodspeed 712a03300b SL-11216: Add llsd::drill() function to drill into an LLSD blob. 
We include both const and non-const overloads. The latter returns LLSD&, so
you can assign to the located element.

In fact we already implemented the non-const logic in a less public form as
storeToLLSDPath() in lleventcoro.cpp. Reimplement the latter to use the new
llsd::drill() function.
 2019-05-30 15:35:54 -04:00
Rider Linden e2e63598d4 Merge 2018-02-26 09:29:38 -08:00
Rider Linden d7dd10b88b Split for viewer/simhost sync LLSD with simhost. 2017-11-30 11:32:22 -08:00
Oz Linden 8dff769dc9 do not insert a null char into the std::string when serializing llsd notation 2017-03-09 11:32:06 -05:00
Oz Linden 436119268d add convenience function ll_stream_notation_sd for compact representation of llsd 2016-08-11 14:08:49 -04:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
callum_linden 5c5821b758 Update to build on Xcode 6.0: clang warned about comparison of unsigned int to >=0 - correct ifx here is to retype the variable as signed 2014-10-17 14:01:08 -07:00
Brad Payne (Vir Linden) f7c9739fd9 SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of onAISUpdateReceived. 2013-06-05 15:13:48 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Nat Goodspeed 8b7c903e5c Fix a couple gotchas in LLSDArray, LLSDParam, llsd_equals(). 
Nested LLSDArray expressions, e.g.:
LLSD array_of_arrays(LLSDArray(LLSDArray(17)(34))
                              (LLSDArray("x")("y")));
would quietly produce bad results because the outermost LLSDArray was being
constructed with the compiler's implicit LLSDArray(const LLSDArray&) rather
than LLSDArray(const LLSD&) as the reader assumes. Fixed with an explicit copy
constructor to Do The Right Thing.
Generalized LLSDParam<float> specialization into a macro to resolve similar
conversion ambiguities for float, LLUUID, LLDate, LLURI and LLSD::Binary.
Added optional bits= argument to llsd_equals() to permit comparing embedded
Real values using is_approx_equal_fraction() rather than strictly bitwise.
Omitting bits= retains current bitwise-comparison behavior.
 2011-01-31 18:00:58 -05:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Nat Goodspeed a81c084deb Add llsd_equals(), a function whose absence sorely puzzles me 2009-05-26 22:36:38 +00:00
Nat Goodspeed dc93462991 svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-2 svn+ssh://svn.lindenlab.com/svn/linden/branches/login-api/login-api-3 2009-05-11 20:05:46 +00:00
Steven Bennetts a4000c3744 merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7 2009-05-08 07:43:08 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Jon Wolk ae464867e6 svn merge -r 90938:92097 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge -> release. This is for QAR-730: Combination merge of QAR-432 and QAR-601 2008-07-15 00:41:08 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release 
dataserver-is-deprecated
 2008-06-26 00:39:00 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge 
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
 2008-06-02 21:14:31 +00:00
Jon Wolk 7dd08303a3 svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voice-group-moderation-3 -> release. Finished product of QAR-134 2007-12-19 00:56:59 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Don Kjer d373dcc7cb svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release 
* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269
 2007-07-20 20:38:05 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Aaron Brashears f118e7c80b result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release 2007-06-13 18:02:37 +00:00
Don Kjer 4ecb9cb63e svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release 2007-05-01 21:39:25 +00:00
Steven Bennetts 934e15973e merge release@57486 release-candidate@57503 2007-01-31 19:36:32 +00:00
Josh Bell fc664e93e6 Port fix for SL-32157 "PowerPC Mac crashes when crossing regions or teleporting with capabilities turned on" from Branch 1-13-2 r56710 via partial merge of release-candidate -r 56743:56744 2007-01-15 19:49:52 +00:00
Josh Bell d60f16540d svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance@56431 
This turned up the following "lost" changes:

	llapp.cpp (from maintenance r55371) - SIGPIPE fix, possibly
	llfontgl.cpp (from maintenance r50207) - whitespace only
	inventorybridge.cpp (property - non-executable)
	skins/xui/*/* (from maintenance r55380) - XML processing instruction went AWOL
 2007-01-04 02:04:29 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00