eebe42abc5
Add include for LLThread.
2014-06-10 16:09:15 +02:00
c02a4f1db0
We need CRASH_SETTINGS_FILE in llapviewer too.
2014-06-10 13:56:19 +02:00
84a7cb9f5a
More GCC happyness.
2014-06-10 13:55:46 +02:00
6db3a5d6dc
Post-Merge sweep over LLSpatialPartition.
2014-06-10 13:49:40 +02:00
e3e3fd917f
Post-Merge: make getPartSourceScript() / getPhysicsShapeUnknown() public again.
2014-06-10 13:39:03 +02:00
4b15d68a2e
Add include for gDisconnected.
2014-06-10 13:20:52 +02:00
e8048406f4
Correct some more merge errors with LL_DEBUGS
2014-06-10 13:07:23 +02:00
a7111940bc
Replace childSetText with childSetValue and add missing includes for LLViewerRegion.
2014-06-10 12:34:16 +02:00
cef556c152
More correction in llplugin ...
2014-06-10 11:23:07 +02:00
9c7ab535d4
Adjust for changes in LLUI after merge,
2014-06-10 11:17:28 +02:00
46f4e82aab
Workaround for broken code after merge.
2014-06-10 11:06:00 +02:00
4a38a5b528
Use LL's code for ::updateClass (LLInstanceTracker functions) again.
2014-06-10 11:03:33 +02:00
a40d2d1f74
Add missing include of boost/function.hpp.
2014-06-10 11:02:05 +02:00
24ee3f7d46
Add missing CRASH_SETTINGS_FILE.
2014-06-10 11:01:35 +02:00
fe7ef77c66
Fix for merge error in llrefcount, pull intrusive_ptr_add_ref/release out of boost namespace again.
2014-06-10 11:01:03 +02:00
ec8aac269f
Fix merge error in llurlrequest.cpp.
2014-06-10 10:50:47 +02:00
87d479e723
Fix merge error in llplugin.
2014-06-10 10:48:22 +02:00
55567f9de2
Make GCC happy again after merge.
2014-06-10 10:47:25 +02:00
81f714e433
Correct merge error in llerror.cpp.
2014-06-10 10:46:51 +02:00
d1fc3826a4
Merge
2014-06-09 23:28:33 -07:00
8863d9beaf
Compile fixes
2014-06-09 23:27:05 -07:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
4a4f244431
Updated Polish translation
2014-06-09 13:33:31 +02:00
98bcc6f044
OnClientDumpRequest is static, work around that.
2014-06-09 03:59:36 +02:00
e0ce9255f2
OpenSSL update (Windows).
2014-06-09 02:30:30 +02:00
8dd6781e00
Windows: Only send crashreport in case we had a real crash+minidump.
2014-06-09 02:26:08 +02:00
7c0d10a692
Make the VFS entry in about localizable.
2014-06-09 02:12:27 +02:00
fef5cfdfd6
Show cache creation time (as UTC) in about and regsysinfo.
2014-06-08 23:33:14 +02:00
b24e5056e0
Do not tweak LD_PRELOAD or LD_LIBRARY_PATH unless we have to.
2014-06-07 00:50:16 +02:00
5672d3d362
Upgrade openssl (Linux/OSX) to 1.0.1.h.
2014-06-06 17:45:51 +02:00
70d37d498f
wrong zlib snuck in. :O update openssl and libcurl accordingly.
...
--HG--
branch : Mac64
2014-06-05 17:01:29 -06:00
2a018eb1cb
Updated Linux-boost with proper rpath set.
2014-06-05 19:33:59 +02:00
81c4893697
KDU upgrade.
2014-06-05 13:49:18 +02:00
99ab6bd049
Add ETW support to get custom trace points eg in xperf traces.
2014-06-04 18:37:19 +02:00
7bc14a113e
Test for existance and execution rights before tryin g to register second life and hop protocol.
2014-06-04 18:35:24 +02:00
d7433f4414
FIRE-12569; rewrite boolean test for real old cmake versions.
2014-06-04 16:48:19 +02:00
03e396af4b
Transplant cmd key fix to Mac64 branch
...
--HG--
branch : Mac64
2014-06-04 07:20:08 -06:00
b7ec907d4f
Yet another libcurl update
...
--HG--
branch : Mac64
2014-06-04 07:18:27 -06:00
9d6bd8b968
Gah, missed a ) when recreating the file.
2014-06-02 17:27:12 -05:00
23e41ff5cb
FIRE-13896: Use correct library on 64-bit Linux.
2014-06-02 15:57:16 -05:00
f012adc883
Fix --clean error on Win64 and clean the right thing on Linux 64.
2014-06-02 07:12:54 -05:00
148fc99607
FIRE-13898: Opening nearby chat by clicking a nearby chat toast results in multiple tabs shown simultaneously
2014-05-30 19:24:12 +02:00
6585265323
Updated Polish translation: Removing keystroke shortcuts for few menu options to stop conflicts with diacritics
...
A window popping up in the middle of conversation and blocking further typing is at least annoying
Removed shortcuts (5): Ą - Debug Avatar Textures, Ć - Contact Sets, ł - Drop a Packet, Ń - Beacons, Ś - Debug Settings
All the rest (ą, ć, Ę, ę, Ł, ń, Ó, ó, ś, Ź, ź, Ż, ż) are not affected (ground sit was replaced earlier, in f587bdc5a85a)
2014-05-30 15:24:48 +02:00
238eced6ea
FIRE-13896: Make sure to use our libpangocairo when building on 64-bit Linux.
2014-05-30 01:05:52 -05:00
83f1dcf45f
Polish translation: Removing redundant strings in About Land floaters
2014-05-29 23:36:32 +02:00
4de0d7f20e
Merge.
2014-05-29 19:07:57 +02:00
fcc517f8e1
More OSX cocoa fixes. Call function with correct types instead of hacking around the type system to make the compiler happy.
2014-05-29 19:07:03 +02:00
4f5a337421
FIRE-13860: Fix RLVa restrictions for minimap context menu
2014-05-29 18:38:13 +02:00
a97f44bc8d
Updated Polish translation
2014-05-29 15:32:15 +02:00
f3aefbdb5e
FIRE-13886: Extend settings backup to backup muted group chat configuration
2014-05-29 13:00:16 +02:00
Nicky