ee34ea1f4b
Merge viewer-bugsplat
2018-10-27 00:50:58 +02:00
289813994e
DRTVWR-474: Clean up use of LLDir::getAppRODataDir(), esp. on Mac.
...
Clearly it's not obvious to maintainers that on the Mac, getAppRODataDir()
returns the app's Resources directory: in a number of places the code starts
with the executable directory and appends "../Resources" to find that.
2018-09-13 16:20:05 -04:00
d5de986a95
CA file path fix
2018-03-02 20:45:02 +01:00
364072f2bf
MAINT-8297 Mac path fix
2018-03-02 15:17:05 +02:00
5a273d430a
MAINT-8297 path fix #2
2018-03-02 19:46:06 +02:00
806262c388
MAINT-8297 path fix
2018-03-02 18:47:35 +02:00
3a1fcb9521
Merge Firestorm LGPL
2018-01-17 20:28:45 +01:00
d7c8678c3a
merge 5.1.0-release
2018-01-17 12:43:28 -05:00
04a10663ff
Replace remaining ND_BUILD64BIT_ARCH definitions with ADDRESS_SIZE
2018-01-17 14:12:01 +01:00
915496bbea
Merge viewer-vivox
2017-03-21 22:14:02 +01:00
2290d5ed16
Merge with viewer64, first pass.
2017-01-10 19:33:15 +01:00
c992a6df9f
DRTVWR-418: std::string::find() returns std::string::size_type.
...
Storing it in a U32 and then comparing it to std::string::npos isn't going to
work in 64 bit land.
2016-12-20 09:20:38 -05:00
3cf542d81d
DRTVWR-418: Store std::string::find() result in size_t, not U32.
...
In a 64-bit build, std::string::npos is way bigger than a U32.
2016-12-15 09:35:12 -05:00
4bf583aaa2
SL-429: Use a new certificate authority bundle based on data from Mozilla
2016-07-21 17:14:07 -04:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
d805a2692d
Fix cache creation on OS X for OpenSim and 64-bit builds.
2015-05-15 12:45:22 -05:00
22e028c9ae
Merge with lgpl tip.
2014-06-14 17:58:37 +02:00
2455a0a8e0
Replaced even deprecated logging macros.
2014-06-11 18:24:52 +02:00
6babf8abd2
Merge LL 3.7.7
2014-06-09 11:29:57 -07:00
963c51c28f
Merge with latest tip.
2014-05-26 13:12:32 +02:00
8fd6092917
Initial 64-bit and universal darwin support
...
--HG--
branch : Mac64
2014-05-24 23:13:01 -06:00
381287b3eb
Merge lgpl with LL breakpad changes.
2014-05-02 17:09:26 +02:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08:00
d8c02bf062
Merge
2013-08-19 16:09:28 -06:00
d83c51a4e1
BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros
2013-08-14 21:58:30 -07:00
ce9962b338
Merged in viewer-release
2013-07-11 17:49:13 -07:00
8642f57dd9
Removed debugging.
2013-05-16 10:31:33 -07:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
03511c75c3
Merge LL 3.6.2 release
2013-08-05 13:50:45 -07:00
ce73bbe4cc
FIRE-8226: Separate caches between Havok and OpenSim versions, clean up old code in lldir_mac.cpp
2013-07-11 19:40:56 -06:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
3a72577f39
Fixes from Oz's merge.
2012-12-13 18:27:32 -08:00
eca6199852
Ported slplugin and some other missing components for cocoa.
2012-11-12 18:06:32 -08:00
bc9a02541f
Post-merge build fixes.
2013-01-05 15:44:03 -06:00
30e8da41b0
Merging Cocoa UI rework.
2013-01-05 13:55:41 -06:00
5b5f4c8bf5
Merge LL 3.4.2 release,
...
broken revision, KDU package needs updating, mac packager also likely broken
2012-12-14 07:59:55 -08:00
1154d5afde
Reverted boost/cocoa changes to purely Mountain Lion fixes.
2012-07-25 16:08:27 -07:00
3b560d4c49
Some cocoa that doesn't work
2012-07-25 16:03:50 -07:00
ed4b379067
Eliminated countFilesInDir boostified getCurPath for OSX
2012-07-24 12:11:20 -07:00
c203702459
VWR-25861 VWR-25862 Removed LLDir_Mac::deleteFilesInDir() virtual method.
...
The LLDir base class method will now be used instead. The handling of the mask
parameter was inconsistent between the two implementations, and the failure
to remove the old method was probably just an oversight.
2011-05-27 12:55:31 -04:00
e213a36f70
STORM-477 Restored the backed out changeset: b62b260aa04d
2011-05-11 18:12:23 +03:00
c18e2f74b0
STORM-1182 Use string::rfind instead of string::find
...
... so the last occurance of the build prefix in the executable path
will be matched. This should avoid cuttung too much subdirs away if
someone checks out the source to a path already containing
"/build-darwin-" or "/build-linux-".
2011-04-26 22:22:33 +02:00
95f41fbd9b
STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev checkout on Mac.
...
Ported Vadim's STORM-1182 fix for Linux (3d30b2bc1369) to the
corresponding Mac file.
2011-04-25 13:46:31 +02:00
330978decd
STORM-480 remove (unused) LLDir::getRandomFileInDir
...
--HG--
branch : storm-102
2010-10-28 22:40:37 -04:00
4fa6500b51
STORM-480 remove unused "wrap" parameter from LLDir::getNetFileInDir
...
--HG--
branch : storm-102
2010-10-28 18:09:09 -04:00
f2b244d3aa
Remove obsolete Mac-only function. From VWR-25861/25862, fixes FIRE-3355.
2011-10-05 01:07:12 -05:00
e277b8a4ac
Merge with LL 2.6.9, initial work. Needs tests, extra XUI merging with particular skins.
2011-08-04 11:53:40 -04:00
bb04abd971
RLVa mergeup
2010-11-17 06:19:05 -08:00
Ansariel