Commit Graph

19 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Ansariel 41b534a741 FIRE-13582: Object Z-position spinner in tools floater should allow negative values for OpenSim 2015-11-30 10:45:00 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Tank_Master 6babf8abd2 Merge LL 3.7.7 2014-06-09 11:29:57 -07: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
Tank_Master d4640277d0 Merge LL 3.5.3 release. 2013-07-09 16:24:58 -07:00
leyla_linden fefc37e92f SH-808 making sure the 10m vs. 64m scale limit switch happens for both the spinner and the manipulation tools etc. 2011-01-28 16:39:02 -08:00
Arrehn 87dd359b1c Opensim - detect and use various configuration limits which might be different from SL, by ArminW 2011-08-28 07:10:09 -04:00
Oz Linden a5619d16f7 correct licenses (fix problem with license change merge) 2010-10-13 07:24:37 -04:00
Dave Parks fecf1883ef Increase default scale limit to 64m 2010-10-07 15:58:01 -05:00
James Cook 35862b86bd Remove inline llwarns to cut out some linker bloat. 2009-12-18 08:43:00 -08:00
Xiaohong Bao cb8641a639 fix for DEV-27483/SEC-283: Viewer crash: LLXform::setParent Creating loop when setting parent 2009-06-27 01:05:56 +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
Kelly Washington dc48f1c741 svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.

QAR-448
2008-04-03 22:50:22 +00:00
Brian McGroarty 788c18c00d Merge maint-viewer @ r71064 2007-10-11 19:43:20 +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 13c391f198 EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
2007-09-14 21:13:20 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00