Commit Graph

45624 Commits (5e495ee954b43deaecdc1e44863eb8f55328bb93)

Author SHA1 Message Date
Nicky 5e495ee954 Do not copy libdb, it's not needed. 2015-05-06 13:57:41 +02:00
Nicky cdc66c9c22 Add kdu/fmodex for linux and win32. 2015-05-06 13:57:14 +02:00
Nicky 55eb540c8e Post-merge; compare with indra\cmake from LL. 2015-05-05 18:59:52 +02:00
Nicky 73f0a7d4c4 Use collada14dom23 and not collada14dom23. 2015-05-05 18:17:07 +02:00
Nicky 63cdfcb5d3 Current libpng is 1.6. 2015-05-05 18:16:11 +02:00
Nicky 1ff23528d6 Add freetype2 to include search path. 2015-05-05 18:13:45 +02:00
Nicky a2034b47d2 Add BOOST_ALL_NO_LIB to prevent boost-autolink. 2015-05-05 18:12:23 +02:00
Nicky 40c5ed2f0e Fix merge error. 2015-05-05 18:11:41 +02:00
Nicky d5bfadb17d Correct typo. 2015-05-05 18:11:16 +02:00
Nicky f8448a7f36 Make code compatible with latest boost version. 2015-05-05 18:10:54 +02:00
Nicky 6c14e0d8d4 Bring constant back. 2015-05-05 18:10:24 +02:00
Nicky 50f40ab271 Compile fix. 2015-05-05 18:09:57 +02:00
Nicky 9ff5d733f5 Bring back some old types. 2015-05-05 16:26:11 +02:00
Nicky b27312a2d2 mAppearanceSerialNum for legacy baking is not accessible anymore, use a local static. 2015-05-05 16:25:46 +02:00
Nicky 2fdc8f7c2c Use the new ll_round to avoid ambiguity. 2015-05-05 16:24:41 +02:00
Nicky 588119e016 Fix merge error. 2015-05-05 16:24:14 +02:00
Nicky 5e639c907d Allow to compile w/o growl. 2015-05-05 16:23:51 +02:00
Nicky 253417a868 Bring back needed types for legacy inventory. 2015-05-05 16:23:24 +02:00
Nicky af9f201120 Packages for Windows x64. 2015-05-05 16:13:22 +02:00
Nicky 2b0c80ec99 Corect merge issues. 2015-05-05 14:54:26 +02:00
Nicky 87eb71b987 The Windows x64 uses a static colladadom. So do not copy it. Also do not copy growl dlls for now. 2015-05-05 14:16:30 +02:00
Nicky e774ad4396 Shut up cmake warnings. 2015-05-05 14:15:53 +02:00
Nicky 38223b1996 Use standard 32 bit plugins, not our custom versions. 2015-05-05 14:15:33 +02:00
Nicky 3bfc9aa8d9 Configure for VS2013. 2015-05-05 14:14:58 +02:00
Nicky c73a5b51ea Fix merge error. 2015-05-05 14:14:35 +02:00
Nicky a2199b1720 Disable growl for now, it's broken when using configure (seems to get installed twice), also no x64 package yet anyway. 2015-05-05 14:14:18 +02:00
Nicky aafdb0eef9 Doe not add /arch:sse2 for windows 64 bit builds, x64 implies sse2 and vs2013 will error if the command switch is added. 2015-05-05 14:13:19 +02:00
Nicky 6939039e70 Start afresh with autobuild.xml from LL and add our configurations and packages. 2015-05-05 14:12:24 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Nicky 07ca444f76 Pre merge: Remove linux64 packages to cut down on conflicts. 2015-05-05 11:39:02 +02:00
Ansariel 072e303c82 More banging at URI things: Want to show the full URI in the console as well... 2015-05-04 13:55:09 +02:00
Ansariel 6e21b3e96d Make URI query part color customizable 2015-05-04 10:34:22 +02:00
Ansariel aabeeadf77 More hammering on the URI fail:
* Don't try to parse an unescaped URI - it will fail; unescape the label after parsing
* Use the default tooltip text for the labels
* Set the tooltip for both host and query part of an URI
2015-05-04 10:17:43 +02:00
Ansariel dba72bf063 Move clearing functions combobox where Cinder moved it in STORM-2115 so we will not end up with a dupe 2015-05-04 00:34:23 +02:00
Ansariel 6477e1c742 More URI unfailing 2015-05-04 00:26:12 +02:00
Ansariel 6dbb17f903 Merge latest changes from main repo 2015-05-02 21:31:11 +02:00
Ansariel a5c886295a Don't need the caption for the abuse report screenshot - should be obvious and messes up layout 2015-05-02 18:15:46 +02:00
Northspring aa67593cdc Move the "route llOwnerSay to script debug window" from Chat -> Chat Windows to Chat -> Visuals, as that option does not actually open a _chat_ window 2015-05-02 18:04:45 +02:00
Northspring de6ab88d69 Visually alter Prefs -> Chat -> Chat Windows a little bit and make some space again after recent changes... 2015-05-02 17:48:56 +02:00
Northspring b4d1544460 Updated Polish translation 2015-05-02 16:41:46 +02:00
Ansariel 42a6e89e14 Update German translation 2015-05-02 11:31:34 +02:00
Ansariel d0b9886b28 Fix whitespaces 2015-05-02 11:31:21 +02:00
kadah.coba@gmail.com 7a7b96bf9d Fixed minor annoying layout issue with script editor when window at minimal size 2015-05-02 01:39:19 -07:00
kadah.coba@gmail.com 66ddfbf033 FIRE-15988: Add option (FSllOwnerSayToScriptDebugWindow) to route llOwnerSay messages to the script debug window 2015-05-02 01:27:02 -07:00
Ansariel ab490c9102 Add LessThanEquals and GreaterThanEquals sanity type checks part 2: Add the according notification strings 2015-05-01 22:05:57 +02:00
Ansariel e00cc1c9ce Add LessThanEquals and GreaterThanEquals sanity type checks and remove kludges in settings.xml 2015-05-01 21:58:23 +02:00
Ansariel a2b6de90b2 Adjust the factor for calculating mMaxResidentTexMemInMegaBytes when exceeding 512MB texture memory as it seems to have quite a performance impact otherwise if we have to discard texture details 2015-05-01 21:01:24 +02:00
Nicky 25e15f6730 For each inventory item inserted there was a linear search over all sibling items (in the folder), replace this with a much simpler parent lookup. 2015-05-01 14:59:41 +02:00
Ansariel ea2e57cf07 "Find All Links" option is missing from inventory context menu 2015-05-01 13:44:08 +02:00
Ansariel d93033f094 Remove unnecessary re-setting of settings 2015-04-30 21:42:55 +02:00