Commit Graph

40 Commits (ce5baf14ac62ecd3bf471e1b49a4e166310ebe1a)

Author SHA1 Message Date
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Monty Brandenberg fdb2ae8335 Merge of viewer-development (3.4.1). 2012-08-03 11:57:51 -04:00
Monty Brandenberg 8e5197a71b Merge 3.3.3 release with Drano HTTP library at 3.3.0
Big delta was converting the new texture debugger support code
to the new library.  Viewer manifest should probably get an eyeball
before release.
2012-07-02 18:06:22 -04:00
Monty Brandenberg fb5a29c069 Platform fixups Linux: unused variables, make error strings constant. 2012-06-01 23:06:24 +00:00
Todd Stinson cbebd682f7 Removing windows line endings from .h and .cpp files. 2012-04-25 13:04:13 -07:00
prep fab57eea61 pull and merge from viewer-development 2012-03-13 15:48:24 -04:00
prep 95aa437160 Path-305: Added support for retrieving compressed navmeshes in a LLSD. 2012-02-22 12:00:37 -05:00
Richard Linden 5a14a67e06 converted a bunch of narrowing implicit conversions to explicit 2012-02-01 13:03:46 -08:00
Richard Nelson ff46a6f423 EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimings 2011-08-18 13:59:38 -07:00
Richard Nelson 11005a9d91 added fast timers to profile inventory LLSD deserialization 2011-08-10 10:52:56 -07:00
Dave Parks 3a409e6edc SH-1603 Replace every occurrence of "WTF" with something more appropriate. 2011-05-25 18:45:21 -05:00
Dave Parks 6b9a2d24cc SH-477 Better mesh streaming cost estimation. 2011-03-30 18:38:22 -05:00
Nyx (Neal Orman) be1fd73390 CTS-320 SH-465 FIX use system zlib for standalone builds
pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx
2010-11-22 18:42:34 -05:00
Boroondas Gupte 0aba56e2db CTS-320 (part 3 of 3) use system zlib for standalone 2010-10-25 11:39:56 +02:00
Boroondas Gupte 03acf85c36 CTS-320 (part 2 of 3) use system zlib for standalone 2010-10-25 11:38:33 +02:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks 23b4dc6189 Fix for serialization deprecation problems. 2010-09-29 18:10:27 -05:00
Dave Parks 7c2b9221d6 merge 2010-09-27 15:20:27 -05:00
Dave Parks 35c81f75ac Fix for bad zipping of meshes and add mesh icon back to repository. 2010-09-24 23:52:32 -05:00
Brad Payne (Vir Linden) 90e3d83a5c Fix for build failures - disabling tcmalloc for now 2010-09-21 13:26:52 -04:00
Tofu Linden 68a974e337 Bunch of trivial typo fixes that were bothering me on another branch! 2010-09-13 20:28:17 +01:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Dave Parks de663d15df Cleanup from review. 2010-04-06 17:37:31 -05:00
Dave Parks 807d835c2b First draft of skin weights in .mesh asset 2010-04-02 14:43:05 -05: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
Adam Moss b01c75cb42 svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1

QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-04-16 23:45:35 +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
Andrew Meadows 222bca24c1 svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-server/qar-841
this is a combined mergeback of the following branches as per QAR-841:
  maint-server/maint-server-1 (absorbed by maint-server-2)
  maint-server/maint-server-2
  maint-server/maint-server-3
  havok4/havok4-8
  havok4/havok4-9

yes dataserver-is-deprecated
2008-09-05 22:03:35 +00:00
Josh Bell 292627c09d svn merge -r 91176:92383 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-23-Server
Backport fixes from the 1.23 Server branch

* DEV-17223 remove the words slot and bets from dataserver.xml
* DEV-17351 Unable to set estate manager
* DEV-17138 users with god mode capabilities not able to join groups
* DEV-17785 SVC-2633: Floating Text which was set before Server Update 1.23 does not do linebreaks anymore but one line instead
* DEV-17863 Memory Leak in 1.23 (related to returning objects?)
* DEV-17804 CSR tool showing old data on Summary page
* DEV-17811 Ban list showing (???) (???) for names

dataserver-is-deprecated
2008-07-17 22:30:12 +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
Dave Simmons 580f9088b4 svn merge -r90394:90492 svn/branches/havok4/qar-689 --> release
QAR-689 - branch/havok4/havok4-7 r89805 is ready for merge back into release
2008-06-25 16:22: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
Josh Bell 2fdd7c35f3 svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release
Merge patches from 1.19.1 Server branch:

* QAR-293 Fix for hardcoded TTLs in web dataservices
* DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size
* Bounce apache2 processes before starting backbone/dataserver/simulator
* Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61.
* Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak
* Fixed minor, non user facing bug in multiagentchat
* set-classified-stats: Rewrote to use new MDB2 query reformatting syntax
* Fixed possible bad conversion of vivox data
* DEV-550, caching changes to DirClassifieds Query
* QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend
* More mem leak fixes for multiagent-chat
* QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP
* DEV-10151: Sometimes group IMs appear to be person to person IMs
* QAR-321 Changes to crash_reporter
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY).  Web service version of this, must use two named queries because we need to change the query based on input string length.
2008-02-28 18:15:01 +00:00
Josh Bell 8bd6a0b321 svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386
QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files
2008-02-07 17:15:18 +00:00
Don Kjer c1920e3c1c EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/maintenance-2 into release
ACTUAL MERGE: svn merge -r 73210:73222 svn+ssh://svn/svn/linden/qa/maintenance-2-merge-73206 into release
2007-11-09 01:56:15 +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 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
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00