Oz Linden
f0bc8a0f71
convert tabs to spaces where they are forbidden
2011-08-17 12:33:23 -04:00
seth_productengine
52b9842ced
STORM-1476 FIXED Replaced non-fatal errors in LLDirIterator constructor with warnings to avoid viewer crashes.
...
Added exception handling case.
2011-07-07 21:09:09 +03:00
Squire
14105610c7
CHOP-662 cleanup in response to code review.
2011-06-21 20:46:32 -07:00
Squire
f02dc7e1b6
CHOP-662 Coupl of fixes to extended unit-test
2011-06-20 12:17:25 -07:00
Squire
306759835d
Added more tests to cover the common examples in the crash logs
2011-06-20 11:07:17 -07:00
Squire
c0971cd0a1
CHOP-662 Added booost library to unittest for lldiriterator.cpp
2011-06-17 16:46:31 -07:00
Squire
29f1b466e6
COP-662 Added newline at end of file for Linux build
2011-06-17 14:13:01 -07:00
Squire
f86a488231
CHOP-662 - initial fix to problems with regex characters in Group names
...
causing the LLDirIterator to crash the viewer when opening chat logs
2011-06-17 11:05:31 -07:00
Logan Dethrow
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
Oz Linden
cb936d097f
pull back fix for STORM-1260 from beta branch
2011-05-17 18:47:51 -04:00
seth_productengine
32313dd3c6
STORM-1260 FIXED Replaced llerrs messages with llwarns in directory iterator code to avoid viewer halt when a cache dir is not found.
2011-05-17 20:22:46 +03:00
Dave Parks
8a92612fd9
merge
2011-05-16 12:34:15 -05:00
Dave Parks
93696ac019
merge
2011-05-12 17:39:08 -05:00
Seth ProductEngine
e213a36f70
STORM-477 Restored the backed out changeset: b62b260aa04d
2011-05-11 18:12:23 +03:00
Seth ProductEngine
662bc0803c
STORM-477 Restored the backed out changeset: c9cc202293b7
2011-05-11 18:12:48 +03:00
brad kittenbrink
032e5d30c0
Merge.
2011-05-03 17:52:52 -07:00
Dave Parks
a25f898703
merge
2011-05-02 14:52:12 -05:00
brad kittenbrink
36986de1fc
Fix for mac compile error in VWR-25608 fix.
2011-04-27 16:02:16 -07:00
brad kittenbrink
4bc90f24b3
FIX VWR-25608 error on shutdow due to buffer overflow in LLVFS::audit
2011-04-26 14:58:58 -07:00
Boroondas Gupte
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
Boroondas Gupte
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
Dave Parks
764412f9b5
merge
2011-04-22 11:50:19 -05:00
Vadim ProductEngine
27301aa546
STORM-1182 FIX Fixed XUI Preview tool not loading XML files from a dev checkout on Linux.
...
The bug seems to be caused by recent switch to Autobuild, which affected the build directory path.
2011-04-19 23:46:18 +03:00
Oz Linden
7e3c32308c
merge out 2.6.0 changes from viewer-development
2011-03-18 08:08:12 -04:00
callum
aac70bccad
Merge with tip of http://hg.secondlife.com/viewer-development (rev 14798)
2011-03-09 15:34:43 -08:00
Richard Linden
8886460a22
SOCIAL-654 WIP Items purchased on Marketplace.secondlife.com while logged into Minimal skin are declined and not present in inventory
...
made notification text skinnable
2011-03-09 00:21:57 -08:00
Loren Shih
47781184fc
Automated merge up from viewer-development into mesh-development
2011-04-04 10:42:52 -04:00
Loren Shih
037a83cd47
Automated merge up from viewer-development into mesh-development
2011-03-16 14:54:56 -04:00
Loren Shih
c8293e29ca
Automated merge up from viewer-development into mesh-development
2011-03-09 11:24:54 -05:00
Oz Linden
b7c49f0f47
merge up from viewer-development and viewer-autobuild
2011-03-03 07:20:54 -05:00
Oz Linden
c89e281de1
merge changes from jenn_linden/viewer-vs2010
2011-02-17 21:01:23 -05:00
brad kittenbrink
83a42e91d4
Ported over mani's patch for handling finding of the RO appdata dir when running from the debugger.
...
ported from changeset https://hg.lindenlab.com/alain/indra-common/changeset/99a9d1876e83/
reviewed by Richard.
2011-02-17 16:20:58 -08:00
Oz Linden
75f7aca107
Automated merge with ssh://bitbucket.org/jenn_linden/viewer-vs2010
2011-02-16 18:24:03 -05:00
Alain Linden
c98996e684
fix test failure caused by dubious method for testing an empty string.
2011-02-15 12:03:45 -08:00
Boroondas Gupte
1d00010207
OPEN-29 Cleanup: strip trailing whitespace
...
As people will have to rebuild half the tree anyway, because these
headers changed, we might as well prettify them a bit.
2011-02-11 02:09:20 +01:00
Boroondas Gupte
1c931920af
OPEN-29 Cleanup: removed superflous "public:"
...
Not related, just a while-I'm-at-it thing.
2011-02-11 01:41:34 +01:00
Boroondas Gupte
627c763439
OPEN-29 Cleanup: removed extra qualification ‘LLDir_Win32::’ on member ‘getNextFileInDir’
...
Before OPEN-29, when lldir_win32.h would have been included when
building for Linux, GCC would error out with
indra/llvfs/lldir_win32.h:50: error: extra qualification ‘LLDir_Win32::’ on member ‘getNextFileInDir’
which, although unintended, probably was a Good Thing (TM), as this
would have aborted the build, so that the wrong include would be
noticed. Now that we explicitly error out with a (hopefully) useful
error message, this isn't needed anymore.
2011-02-11 01:35:21 +01:00
Boroondas Gupte
29b3207fe4
OPEN-29 Error out if lldir_<platform>.h is included when building for a different platform
...
As far as I know, there is no good reason to include e.g.
indra/llvfs/lldir_win32.h while not building for a windows target, so be
better prevent this to avoid hard to find errors.
2011-02-11 01:27:01 +01:00
Brad Payne (Vir Linden)
7a43bd5d9d
Fix for linux build breakage
2011-02-10 17:33:55 -05:00
Loren Shih
fbc6e5d639
Automated merge up from viewer-development into mesh-development
2011-02-01 11:28:22 -05:00
jenn
c2d1f9215a
Merge in changes from mani_linden/viewer-vs2010
2011-01-25 10:36:14 -08:00
Xiaohong Bao
4af7e9eb64
Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.)
2011-01-21 16:25:23 -07:00
Seth ProductEngine
4af9db7b79
STORM-477 FIXED Re-implemented LLDir::getNextFileInDir() as an iterator object.
...
- Replaced all existing usages of LLDir::getNextFileInDir() with the new directory iterator object.
- Removed platform specific LLDir::getNextFileInDir() implementation.
2011-01-11 19:50:58 +02:00
Seth ProductEngine
4e150d3271
STORM-477 WIP Re-implemented LLDir::getNextFileInDir() as an iterator object.
...
- Added a class implementing directory entries iteration with pattern matching which is used in unit tests instead of LLDir::getNextFileInDir.
STORM-550 FIXED Fixed LLDir unit test which failed for some complex wildcard combinations.
2010-12-17 22:16:14 +02:00
Xiaohong Bao
57065fe5a9
fix for SH-367: mesh viewer lock up: Problem removing object.cache - errorcode: 13
2010-12-15 17:20:58 -07:00
Loren Shih
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
Monroe Linden
1e050c2ed8
merge
2010-12-02 14:33:42 -08:00
Loren Shih
bfd8efb057
Automated merge up from viewer-development
2010-12-01 10:55:24 -05:00
Nat Goodspeed
b9d9a84f74
Fix test failure due to erroneous validation of fputs() return value.
2010-11-19 16:59:28 -05:00
Richard Linden
50d21a75a7
merge
2010-11-15 15:52:54 -08:00