77d7edd415
Update to build on Xcode 6.0: using an assignment in an expressions without parens
2014-10-17 15:07:19 -07:00
6fadab686d
Update to build on Xcode 6.0: variable (result) can be unitialized if condition is false (TAKE 2) [-Wsometimes-uninitialized]
2014-10-17 15:00:14 -07:00
f292809239
Update to build on Xcode 6.0: variable (result) can be unitialized if condition is false [-Wsometimes-uninitialized]
2014-10-17 14:57:22 -07:00
ee652b583c
Update to build on Xcode 6.0: how did this ever compile...
2014-10-17 14:54:04 -07:00
a98b4b6bee
merge changes for 3.7.7-release
2014-05-07 11:09:04 -04:00
e36b905395
revived some deleted files to get mac build working
2014-04-08 18:00:54 -07:00
32bbb07f0a
merge changes for 3.7.5-release
2014-04-08 11:36:22 -04:00
98aabdc176
merge with release
2014-04-07 19:09:40 -07:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
706ec08deb
Merged in viewer-release
2014-03-13 21:55:22 +00:00
5b846ed2a6
merge with release
2014-03-12 12:48:43 -07:00
d2bb4dae98
Fixes for crash reporter startup race condition, crash reporter CPU use, Secondlife.log filehandle, XP Crash.
2014-03-07 14:58:22 -08:00
38915f119c
More memory cleanup of containers after DeletePairedPointer() usage.
2014-02-14 14:57:08 -08:00
d7b902d575
[MAINT-3555] Crash in LLPanel::~LLPanel() on shutdown
...
- Added clear() after DeletePointer() call to hopfully fix this...
2014-02-14 13:56:36 -08:00
6809348125
Creating a cleaner branch
2013-12-03 17:06:06 -08:00
2c5e306e14
MAINT-3474 FIXED crash on startup in LLTextureCache::purgeAllTextures(bool) attempting to delete texture cache
2013-11-22 20:16:37 +02:00
697d2e720b
renamed TimeBlock to BlockTimerStatHandle
2013-10-15 20:24:42 -07:00
1acceb3633
changed ll_aligned_(malloc|free) to take alignment size as a template argument
2013-10-14 10:18:41 -07:00
6115125dd2
BUILDFIX: ll_aligned_free call
2013-09-26 11:20:11 -07:00
52da9f5f49
merge with viewer-release
2013-09-09 18:58:41 -07:00
cbe397ad13
changed fast timer over to using macro
...
another attempt to move mem stat into base class
2013-09-05 14:04:13 -07: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
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
f4943bb2e6
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2013-08-05 19:44:12 -04:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
ce9962b338
Merged in viewer-release
2013-07-11 17:49:13 -07:00
d5febe1ab5
CHOP-956: Add settings_install.xml to settings_files.xml.
...
Also clarify comment for ELLPath in lldir.h: ELLPath int values are read from
settings_files.xml.
2013-06-27 11:07:12 -04:00
a2a6bf20d7
merge with release
2013-06-20 16:46:23 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
c19200eb00
BUG-2707 add some logging to help narrow down what part of login instance handling is going awry
2013-05-30 17:01:28 -07:00
8642f57dd9
Removed debugging.
2013-05-16 10:31:33 -07:00
025c890958
Merge vwr-dev-mat
2013-05-01 08:11:15 -07:00
806d09b114
Merge 3.5.1 into Materials
2013-04-30 19:50:05 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
8e3b190e91
merge
2013-03-11 15:17:13 -04:00
e0c9174609
merge
2013-03-11 15:05:47 -04:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
05f4e8a105
CHUI-778 (Saving preferences updates text in all open message panels in conversation floater to show as old messages) Now changing the log/transcripts file location actually moves the files to the new location. Prior behavior just started a new history at that location. Also a fix was made so that if the user changed the log/transcripts path then after pressing the Preferences 'OK' button the new location will be saved to the corresponding .xml file.
2013-02-22 18:53:40 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
2ac99f55f9
CHUI-578 FIXED Move preferences for conversation logs/transcripts to chat tab
2013-01-24 19:56:13 +02:00
0d8f1077a6
Automated merge with http://bitbucket.org/lindenlab/viewer-development
2013-01-04 16:46:25 -08:00
b6abf5c0ee
Merged
2012-12-16 17:48:32 -08:00
c1db961ab9
Fixed small one-time memory leaks.
2012-12-16 17:45:55 -08:00
5c9dd94e19
BOOL vs bool FIGHT
2012-12-14 21:41:02 +00:00
3a72577f39
Fixes from Oz's merge.
2012-12-13 18:27:32 -08:00
8e99b82645
merge changes for DRTVWR-244
2012-12-13 15:29:07 -05:00
e85e6ca410
Merged from viewer-release
2012-12-11 16:01:35 -08:00
6b059d183b
Crash reporter fixed, debugging removed.
2012-12-11 07:40:26 -08:00
callum_linden