Commit Graph

1403 Commits (98dfd7ddd2083c380aabbb686ca99dfd3bf033e9)

Author SHA1 Message Date
Oz Linden 64c45cbd1a increment viewer version to 3.2.8 2012-01-17 10:39:14 -05:00
Oz Linden 323d27ebcb merge changes for vmrg-216 2012-01-17 10:36:04 -05:00
Oz Linden f6b8bfd3da merge changes for vmrg-215 2012-01-13 09:58:47 -05:00
Richard Linden f1c2707104 Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-01-12 13:16:28 -08:00
Richard Linden 26829e6fa2 Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/ 2012-01-12 12:54:46 -08:00
Vadim ProductEngine a47e9bd97b EXP-1525 FIXED Potential fix for a crash at shutdown: added some error handling to saving inventory cache. 2012-01-10 16:35:36 +02:00
Oz Linden 3dfb1536fa increment viewer version to 3.2.7 2012-01-09 08:41:36 -05:00
Oz Linden 1fb6dbbf80 Backed out changeset 4fd359f2f1c3 2012-01-09 12:26:57 -05:00
Oz Linden 41ceee848b increment viewer version to 3.2.7 2012-01-09 08:41:36 -05:00
Richard Linden 757a955bd7 Looking for better fix to EXP-1693 - date localization
Backed out changeset: 4f3024e9d629
2012-01-06 12:07:52 -08:00
Richard Linden 66fcc2da39 Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-01-05 10:59:29 -08:00
Brad Payne (Vir Linden) a3e30250e8 merge 2012-01-04 09:59:57 -05:00
Jonathan Yap 8a3aa3f6ca STORM-1790 Provide a Develop sub-menu to change the default logging level
co-authored with Zi Ree
2011-12-23 12:06:36 -05:00
Oz Linden 570d562f58 merge changes for vmrg-209 and vmrg-210 back from beta branch 2011-12-21 15:21:12 -05:00
Seth ProductEngine 0ccf2b5a1c EXP-1693 FIXED the date localization in Item Profile window, Voice Morphs window and in scroll list widget in general.
- Added a customizable date format string to be used for scroll list cell of "date" type.
- The date localization does not change the value of a scroll list cell changing only its string representation.
- Added using localized week days and month names from strings.xml for all locales not only Ja and Pl as it was before.
- Changed the date format in Item Profile window (French locale) as noted in the issue description.
- For this fix the French locale still needs the localization of the following strings in strings.xml:
	<string name="dateTimeWeekdaysNames">
	<string name="dateTimeWeekdaysShortNames">
	<string name="dateTimeMonthNames">
	<string name="dateTimeMonthShortNames">
	<string name="dateTimeDayFormat">
	<string name="dateTimeAM">
	<string name="dateTimePM">
2011-12-21 14:10:02 +02:00
Xiaohong Bao efec138037 fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
Xiaohong Bao 4ec112bfce fix for SH-2738 and SH-2777, might also help SH-2723: heap corruption
SH-2738: Texture fetching freezes due to LLcurl
SH-2777: viewer crashed on logout in LLCurl::Easy::releaseEasyHandle
2011-12-15 21:39:48 -07:00
Oz Linden ac94b66a08 storm-1729: ensure that cpu id has no leading or trailing spaces for ease of comparison and formatting 2011-12-13 15:58:34 -05:00
Brad Payne (Vir Linden) 642ea00a08 merge 2011-12-12 10:45:13 -05:00
Oz Linden dbc91a7fac increment viewer version to 3.2.6 2011-12-12 10:03:06 -05:00
Oz Linden f1a4593e47 merge changes for vmrg-204 2011-12-12 09:04:33 -05:00
Dave Parks 50a57ba9fe Backed out changeset fafd857891b1 2011-12-09 12:23:04 -06:00
Richard Linden dd9263d017 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-08 11:02:00 -08:00
Brad Payne (Vir Linden) 8a51346d6f merge 2011-12-07 17:25:06 -05:00
Brad Payne (Vir Linden) 50ed3bde43 merge 2011-12-07 17:06:42 -05:00
Nat Goodspeed 3e6c522084 LLSD-14: Extract remaining conditional LLSD mbrs to namespace llsd.
Per Monty's code review, it's dubious practice to have a class in which
certain members are sometimes visible, other times not. If these were virtual
methods, or non-static data members, the error would be obvious -- but even
with static data members and non-virtual methods, it looks like an ODR
violation. Extract conditional methods as free functions, as in changeset
07cd70e75473.
2011-12-06 09:54:59 -05:00
Dave Parks 1516e4c497 merge 2011-12-05 17:56:38 -06:00
Dave Parks 78233d1bf9 SH-2652 WIP -- Add timers to relevant areas, pause render pipeline while occlusion queries from previous frame are still pending and perform texture decode work. 2011-12-05 17:55:40 -06:00
Nat Goodspeed 1a6846444f LLSD-14: Optional entry points need conditional decls turned on.
Changeset 07cd70e75473 moved LLSD::outstandingCount() and allocationCount() to
free functions so we could turn their visibility on/off via LLSD_DEBUG_INFO.
But on some platforms, without proper LL_COMMON_API declarations visible when
we compile llsd.cpp, those free functions lack proper linkage directives.
Declare LLSD_DEBUG_INFO in llsd.cpp so that when the llcommon library is
built, the free functions get proper linkage -- independent of compilations of
LLSD consumers.
2011-12-05 09:26:10 -05:00
Xiaohong Bao 09feaac844 fix for sh-2738: Texture fetching freezes due to LLcurl 2011-12-05 13:23:05 -07:00
Nat Goodspeed 8cbc54d519 Automated merge with http://hg.secondlife.com/viewer-development 2011-12-01 16:53:28 -05:00
Nat Goodspeed 95fb0249e9 LLSD-14: Move LLSD::(outstanding|allocation)Count() to free functions.
Free functions can be unconditionally compiled into the .o file, but
conditionally hidden in the header file. Static class methods don't have that
flexibility: without a declaration in the header file, you can't compile a
function definition in the .cpp file. That makes it awkward to use the same
llcommon build for production and for unit tests.
Why make the function declarations conditional at all? These are debugging
functions. They break the abstraction, they peek under the covers. Production
code should not use them. Making them conditional on an #ifdef symbol in the
unit-test source file means the compiler would reject any use by production
code. Put differently, it allows us to assert with confidence that only unit
tests do use them.
Put new free functions in (lowercase) llsd namespace so as not to clutter
global namespace.
Tweak the one known consumer (llsd_new_tut.cpp) accordingly.
2011-12-01 16:50:27 -05:00
Richard Linden c191f523a9 Automated merge with http://hg.secondlife.com/viewer-development 2011-11-30 17:57:09 -08:00
Brad Payne (Vir Linden) bdb74cc3be merge 2011-11-30 18:00:59 -05:00
Oz Linden f5a94e0f81 increment viewer version to 3.2.5 2011-11-30 15:27:00 -05:00
Richard Linden d089e6c264 bumped up MSVC warning level to 3 to catch more stuff that gcc catches 2011-11-28 19:16:49 -08:00
Xiaohong Bao fcd232e0fb Automated merge with https://bitbucket.org/VirLinden/viewer-development-shining-fixes 2011-11-28 11:34:53 -07:00
Xiaohong Bao 9850e09f76 trivial: update the memory pool log info to the latest. 2011-11-22 11:51:49 -07:00
Nat Goodspeed e97fb23218 Make LLSD diagnostic methods conditional on LLSD_DEBUG_INFO.
This establishes that there are no viewer-side unit tests relying on these
methods. The point is to try to clean up the LLSD public API. In the same
vein, remove from LLSD public API a diagnostic method which is nothing more
than an implementation detail for the corresponding LLSD::Impl method. The
same effect can be achieved by making LLSD::Impl a friend of LLSD, moving the
method with the messy signature (classic-C arrays!) into LLSD::Impl itself.
2011-11-19 10:02:20 -05:00
Nat Goodspeed b49c934bd9 LLSD-14: fixed way-too-overloaded local variable. 2011-11-17 15:03:25 -05:00
Nat Goodspeed bd5b1ed713 LLSD-14: Make dumpStats()/calcStats() implementation more robust
per Monty code review
2011-11-17 13:55:11 -05:00
Nat Goodspeed 570ac04e16 LLSD-14: while we're in llsd.h anyway, fix longstanding misspellings.
My tollerance is at an end.  :-P
2011-11-17 11:54:13 -05:00
Nat Goodspeed e62c691aab LLSD-14: Fix silly syntax error in subscript bounds check. 2011-11-17 10:02:05 -05:00
Nat Goodspeed cc1fb7bcac LLSD-14: Bring over llsd.{h,cpp} enhancements from server-trunk.
Because new enum values have been added to the LLSD type field, a few external
switch statements must be adjusted to suppress fatal warnings, even though we
never expect to encounter an LLSD instance containing any of the new values.
2011-11-17 08:06:31 -05:00
Oz Linden 7766ccb773 increment viewer version to 3.2.4 2011-11-14 11:23:12 -05:00
Oz Linden 5fa125ea0b increment viewer version to 3.2.3 2011-11-08 18:02:08 -05:00
Brad Payne (Vir Linden) 0c4adf499d merge 2011-11-03 10:55:10 -04:00
Oz Linden 8f47f2222c increment viewer version to 3.2.1 2011-10-31 16:08:55 -07:00
Brad Payne (Vir Linden) 51c7887f8d merge 2011-10-31 11:35:22 -04:00
Xiaohong Bao 0637fe27bc fix for SH-2624: crash at LLPrivateMemoryPoolManager::freeMem: ASSERT (!addr) 2011-10-25 22:53:40 -06:00