52efa3149a
User correct json lib when linking for Windows x86.
2015-05-07 11:47:34 +02:00
441b49a9ec
Re-Add all the pre tools Linux x64 packages.
2015-05-07 11:45:46 +02:00
09bc0aa0de
Do not install colladadom library.
2015-05-06 19:11:39 +02:00
211b2c2dcd
- Enable growl, set the right pkg urls, change the name to gntp-growl so autobuild does not try to install the package multiple times.
...
- Update boost and colladom for win32.
2015-05-06 18:57:48 +02:00
05a49852ed
Do not copy extra pdbs, they are not present in the pkgs from LL.
2015-05-06 18:56:20 +02:00
803e7a2571
System wide Xinerama is needed by the current gtk from LL>
2015-05-06 18:03:31 +02:00
217e879c20
Linux: fstream has no constructor that takes a std::string.
2015-05-06 16:34:41 +02:00
af24f600ae
Do not link against Xinerama.
2015-05-06 16:33:56 +02:00
64ff199240
Growl for Win64.
2015-05-06 16:23:54 +02:00
272b137986
Updated growl for Win32, updated boost and colladaom for Linux
2015-05-06 16:23:34 +02:00
de256b75d9
Post-merge; clean sweep of viewer_manifest.py.
2015-05-06 13:58:57 +02:00
022fecd861
Do not link against Xinerama.
2015-05-06 13:58:25 +02:00
5e495ee954
Do not copy libdb, it's not needed.
2015-05-06 13:57:41 +02:00
cdc66c9c22
Add kdu/fmodex for linux and win32.
2015-05-06 13:57:14 +02:00
55eb540c8e
Post-merge; compare with indra\cmake from LL.
2015-05-05 18:59:52 +02:00
73f0a7d4c4
Use collada14dom23 and not collada14dom23.
2015-05-05 18:17:07 +02:00
63cdfcb5d3
Current libpng is 1.6.
2015-05-05 18:16:11 +02:00
1ff23528d6
Add freetype2 to include search path.
2015-05-05 18:13:45 +02:00
a2034b47d2
Add BOOST_ALL_NO_LIB to prevent boost-autolink.
2015-05-05 18:12:23 +02:00
40c5ed2f0e
Fix merge error.
2015-05-05 18:11:41 +02:00
d5bfadb17d
Correct typo.
2015-05-05 18:11:16 +02:00
f8448a7f36
Make code compatible with latest boost version.
2015-05-05 18:10:54 +02:00
6c14e0d8d4
Bring constant back.
2015-05-05 18:10:24 +02:00
50f40ab271
Compile fix.
2015-05-05 18:09:57 +02:00
9ff5d733f5
Bring back some old types.
2015-05-05 16:26:11 +02:00
b27312a2d2
mAppearanceSerialNum for legacy baking is not accessible anymore, use a local static.
2015-05-05 16:25:46 +02:00
2fdc8f7c2c
Use the new ll_round to avoid ambiguity.
2015-05-05 16:24:41 +02:00
588119e016
Fix merge error.
2015-05-05 16:24:14 +02:00
5e639c907d
Allow to compile w/o growl.
2015-05-05 16:23:51 +02:00
253417a868
Bring back needed types for legacy inventory.
2015-05-05 16:23:24 +02:00
af9f201120
Packages for Windows x64.
2015-05-05 16:13:22 +02:00
2b0c80ec99
Corect merge issues.
2015-05-05 14:54:26 +02:00
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
e774ad4396
Shut up cmake warnings.
2015-05-05 14:15:53 +02:00
38223b1996
Use standard 32 bit plugins, not our custom versions.
2015-05-05 14:15:33 +02:00
3bfc9aa8d9
Configure for VS2013.
2015-05-05 14:14:58 +02:00
c73a5b51ea
Fix merge error.
2015-05-05 14:14:35 +02:00
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
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
6939039e70
Start afresh with autobuild.xml from LL and add our configurations and packages.
2015-05-05 14:12:24 +02:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
07ca444f76
Pre merge: Remove linux64 packages to cut down on conflicts.
2015-05-05 11:39:02 +02:00
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
6e21b3e96d
Make URI query part color customizable
2015-05-04 10:34:22 +02:00
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
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
6477e1c742
More URI unfailing
2015-05-04 00:26:12 +02:00
6dbb17f903
Merge latest changes from main repo
2015-05-02 21:31:11 +02:00
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
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
Nicky