Andrey Kleshchev
980ebf5d94
MAINT-8489 Remove/Cleanup LLIMInfo
2018-04-10 15:59:21 +00:00
Oz Linden
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
Richard Linden
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
Graham Madarasz
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
William Todd Stinson
fa85e16d63
Removing unused code.
2012-11-07 17:47:35 -08:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Alexei Arabadji
2f9cc80c2e
fixed EXT-5910 “Offers logging”,
...
fixed IM message counter when received interactive notification(offer);
corrected logging to file of offer notification;
enabled logging for FRIENDSHIP_ACCEPTED notification;
--HG--
branch : product-engine
2010-03-05 17:53:32 +02:00
Tofu Linden
3064b556ef
CID-315
...
Checker: UNINIT_CTOR
Function: LLIMInfo::LLIMInfo()
File: /indra/llmessage/llinstantmessage.cpp
2010-01-29 15:11:32 -08:00
Bryan O'Sullivan
baa73fddd9
Merge with viewer-2.0.0-3 branch
2009-06-22 15:02:19 -07:00
Steven Bennetts
9ec432034d
merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
...
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Brad Kittenbrink
01d390825a
DEV-27646 dll linkage for login module.
...
Ok, finally got this to a point where it doesn't break the build and I can check
in. llcommon can be built as a shared library (disabled but can be enabled with
cmake cache var LLCOMMON_LINK_SHARED.
reviewed by Mani on tuesday (I still need to get his suggested changes
re-reviewed)
2009-05-22 23:27:16 +00:00
Robert Knop
9a8d069902
svn merge -r118673:120720 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
...
Merging server-1.26 back to trunk.
Two conflicts -- llversionserver.hh (kept the trunk version)
and in llsimparcelmgr.cpp -- also kept the trunk version. There was
some code in 1.26 that included error
printing from RDW that says "we should
really not be hitting this code", and that
code was gone in trunk... so, went ahead
and kept the trunk part of that one
conflict in that file.
2009-05-19 17:16:44 +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
Steven Bennetts
25c10ed028
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
...
dataserver-is-deprecated
2008-06-26 00:39:00 +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
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
Karen Clark
fceae96eb1
svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release.
2007-03-20 22:21:42 +00:00
Aaron Brashears
305c74d516
Result of svn merge -r57264:57370 svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-02-02 17:28:58 +00:00
Steven Bennetts
71d28bdbf0
merge release@56803 release-candidate@56833
2007-01-17 23:02:00 +00:00
James Cook
420b91db29
Print done when done.
2007-01-02 08:33:20 +00:00