Commit Graph

47 Commits (8a952e42e97cfb286192aba0fbfc43986912cd29)

Author SHA1 Message Date
Richard Linden 93645cf55c fix for not properly handling nested brackets in
string replacement, e.g. [[FOO]]
2011-08-19 16:41:53 -07:00
Leyla Farazha a4b223248e Merge 2010-09-27 17:54:52 -07:00
Aimee Linden ffae589843 Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution 2010-09-03 17:41:39 +01:00
Andrew Dyukov 0098a23607 STORM-180 FIXED Fixed crash on login in Japanese locale.
The crash was caused by erroneous getting of month name from vector with week day names in LLStringUtil::formatDatetime().
This code woth introduced in June, so though it didn't work properly, it didn't cause the crash(cause June is 5th month). But when
number of current month exceeded number of days in week(this happened in August cause it is 8th) code started getting 8th element from
vector with 7. This caused the crash. It reproduced only on Japanese locale because only there code that caused it was used(see STORM-177
for details). This changeset seems to fix STORM-177 too.

- Used vector with months names where it should be.
2010-09-16 20:01:00 +03:00
Leyla Farazha 5fab3253f9 Merge from dessie/viewer-release 2010-08-20 14:48:00 -07:00
Oz Linden 06b0d72efa Change license from GPL to LGPL (version 2.1) 2010-08-13 07:24:57 -04:00
Vadim Savchuk 46334b6310 EXT-8309 FIXED Incorrect French date format in place profile and status bar.
Changes:
- Added support for formatting day of the month without leading zero ("sday").
- Changed date format in place profile (landmark info) and in the top status bar
  according to bug reporter's request.

Technical details:
Actually implementation of strftime() in Linux and Windows supports stripping the
leading zero (with "%-d" and "%#d" respectively).
But that's not supported in MacOSX, so I had to reimplement it.

Reviewed by Sergey Litovchuk at https://codereview.productengine.com/secondlife/r/842/

--HG--
branch : product-engine
2010-08-05 15:57:19 +03:00
Leyla Farazha 854e6acb42 Merge with dessie/viewer-release 2010-07-30 18:07:35 -07:00
Mike Antipov 002bbd885b EXT-8318 FIX IMPROVED converted EOLs
--HG--
branch : product-engine
2010-07-26 13:04:28 +03:00
Mike Antipov 8e461d902e EXT-8318 FIX IMPROVED Code is refactored - avoid using of a separate call of the MultiByteToWideChar to get length of output string.
Assumprion is: wide char buffer requires not more than input string length plus one for a null terminator.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/

--HG--
branch : product-engine
2010-07-26 11:44:50 +03:00
Mike Antipov 3ec027b316 EXT-8318 ADDITIONAL FIXED avoid an extra copy of std::string
Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/

--HG--
branch : product-engine
2010-07-23 12:53:37 +03:00
Mike Antipov 3c4f82b298 EXT-8318 ADDITIONAL FIXED ensure that thousands separator is in utf8 format (on Windows) before converting it to LLWString.
Problem on Windows:
==================

LLPanelMainInventory::updateItemcountText() formats number using viewer locale.
non-break space is detected as unknown symbols while converting utf8str_to_wstring when formatted text is set to LLTextBox.

FIX:
===

Added converting of string to multi-byte string and then to utf8 string while formatting on Windows.
  created opposite to "ll_convert_wide_to_string" function "ll_convert_string_to_wide" and helper function to call both of them.
  It is used now to convert result of formatted string while formatting integer number in locale.

Fix affects Windows only.

Reviewed by Richard Nelson at https://codereview.productengine.com/secondlife/r/775/

--HG--
branch : product-engine
2010-07-23 10:26:28 +03:00
Leyla Farazha 33d1aa30ab Merge from dessie/viewer-release 2010-07-06 17:51:07 -07:00
Nat Goodspeed dfc20a8249 EXT-7926: Remove unreferenced catch-clause variable (MSVC error). 2010-06-22 14:59:34 -04:00
Lynx Linden ccad528d5f EXT-7926 FIXED Minor typo correction. 2010-06-22 18:55:04 +01:00
Lynx Linden 4c31f60bba EXT-7926 FIXED Fixed crash opening About for non-English locales.
Calling std::locale("fr_FR.UTF-8") crashes on Linux and Mac. Or
rather, it throws an exception when it doesn't know the locale and we
didn't handle the exception. I now catch the exception and output an
error rather than crash.

Note, this happened because of change 703f3bcf7069, which made us
actually pass a real locale string instead of just "C". So, we were
never actually supporting a locale for LLStringUtil::formatNumber().
There is therefore an open task of making formatNumber() actually
respect the locale. I'll report a separate JIRA to capture that task.
2010-06-22 18:33:39 +01:00
James Cook 49c221b967 Merge with dessie/viewer-public in prep to land code there 2010-06-01 14:33:44 -07:00
Sergei Litovchuk 279f58051d FIXED Linux build.
Added forward specialization of LLStringUtil::format before use in LLStringUtil::formatDatetime.

--HG--
branch : product-engine
2010-05-29 19:36:55 +03:00
Yuri Chebotarev 05626c3371 EXT-7013 FIX time formatting function didn't work for some parameters for Japanise (like weekdays).
reviewed by Vadim Savchuk https://codereview.productengine.com/secondlife/r/457/

--HG--
branch : product-engine
2010-05-28 20:13:18 +03:00
James Cook c7a6a2e08f DEV-50013 Friendlier info if you can't change name due to time lockout
Reviewed with Leyla
2010-05-27 14:56:29 -07:00
Vadim Savchuk b7d0bb9e1e Fixed bug EXT-6399 (System locale is the same for all languages).
Problem:
* English locale was set for all languages.
* Specifying a correct locale didn't affect anything, including date/time formatting.

My investigation has shown that LLStringUtil was instantiated twice: in the
main binary and in libllcommon.so.
Because LLStringUtil::setLocale() was called from newview and getLocale()
was called from llcommon, they effectively used *different* instances of
LLStringUtil::sLocale. Hence getLocale() always returned empty string.

This seems to be caused by get/setLocale() methods not being dllexported.

The fix instantiates get/setLocale() and sLocale in llcommon and exposes
them to use from newview (i.e. prevents multiple instantiation).

Besides, I specified correct locale names for all languages and platforms.

Reviewed by Leyla: https://codereview.productengine.com/secondlife/r/104/

--HG--
branch : product-engine
2010-03-26 19:09:11 +02:00
Paul Guslisty a7eb37012b fixed normal bug EXT-2738 ([BSI] 12-hour clock format should not have a leading zero)
--HG--
branch : product-engine
2009-12-02 12:05:01 +02:00
Steve Bennetts 3eb48e4015 Fix for Windows crash (incorrect date format crashes windows) 2009-11-29 22:13:32 -08:00
Paul Guslisty 9f603cef97 fixed normal bug EXT-2738. 12-hour clock format should not have a leading zero
--HG--
branch : product-engine
2009-11-27 18:50:43 +02:00
James Cook b4b516b966 Fix unclear function names around Pacific versus "SLT" time in string operations.
Reviewed with Brad.
2009-11-02 08:35:37 -08:00
James Cook c6c9064273 EXT-1565 Menu bar clock now shows Pacific (PDT/PST) time, as does any other
UI widget that references "slt" in the XML.
2009-10-30 16:37:39 -04:00
Steven Bennetts 6cb7185684 * EXT-1282 Fixed a crash when attempting to display strings with [] in them
(merged from viewer-2.0-qa-4)
2009-10-08 02:16:29 +00:00
Martin Reddy b5724bc0e9 SNOW-194 DEV-40415: pulling this snowglobe patch into viewer 2.0. This
fixes all of the parentheses warnings in the code.

Original patch was reviewed by merov (and others).
2009-09-25 16:51:25 +00:00
Steven Bennetts 7df79382a0 merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1634 https://svn.aws.productengine.com/secondlife/pe/stable-2@1648 -> viewer-2.0.0-3
* Bugs: EXT-888 EXT-866 EXT-861 EXT-858 EXT-864 EXT-875 EXT-884 EXT-718 EXT-786 EXT-885 EXT-910 EXT-845 EXT-312 EXT-823 EXT-868
* New Development: EXT-748 EXT-863 EXT-835

QA: Please test Recent List to verify it has no troubles.
2009-09-11 23:50:59 +00:00
Martin Reddy 92cccb9790 Reorder some of the new LLStringUtil methods introduced in DEV-39441
to avoid specialisation after instantiation build errors on Mac and
Linux.
2009-09-04 14:02:46 +00:00
Steven Bennetts 2273376dff DEV-39441 - Eliminate boost:regexp from LLString::format
Also removed a missing setting (merge bug)
2009-09-04 00:16:51 +00:00
Richard Nelson 138bf11322 merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684

improved text editor (handles multiple fonts simultaneously as well as inline widgets)
2009-08-24 20:04:52 +00:00
Steven Bennetts 9ec432034d merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3
ignore-dead-branch
2009-06-21 08:04:56 +00:00
Robert Knop f1380f2fc3 Merging from the server/server-1.25 branch
svn merge -r107352:108210
svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25

Merge conflicts were resolved:

  scripts/start-server   : one conflict, kept the "working" version

  indra/llcommon/llversionserver.h : reverted
  indra/newview/Info-SecondLife.plist : reverted
  indra/newview/res/viewerRes.rc : reverted

  indra/newsim/llagentinfo.cpp : kept *both*... "working" had
      is_agent_online, which nothing else had, and the merge had
      isGodAllowed(), part of SEC resolution

  indra/backbone/agent_router.py : kartic & rdw merged and reviewed
      using brains and things

  indra/newsim/llsimhttpresponder.cpp : doesn't exist in trunk, and
      that's OK (even though there was a change for it)
2009-01-19 20:40:59 +00:00
Aaron Brashears e3cf284388 Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165 2009-01-08 00:05:06 +00:00
Steven Bennetts 25c10ed028 QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
2008-06-26 00:39:00 +00:00
Josh Bell 810a0b3dce svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --> release
Effectively:
svn merge -r 87048:88773 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-22-Server
* Plus some gcc4.x fixes

In detail:

* Bump version numbers to 1.22.0 Server
* Updated files for enabled conductor.
* Added tarball pulling during deploy for central servers.
* DEV-15160 Logins not remembering start location on beta grid
* DEV-15167 Random failure with set-classified-stats
* DEV-15193 Viewer Passing Through Unsanitized Strings to DB when creating classifieds.
* Add --location to the curl invocation in fetch_agni_ws_snapshot
* QAR-609 Some Havok4 bug fixes
* QAR-460 Automatic XUI selection & Kick-ass Linux Fonts MergeMe
* DEV-14704 1.21.1.86182 revealing hidden groups in profile
* DEV-14641 Change automated Subject Line messages for IM-to-Email to avoid SPAM association
* DEV-15387 Write unit test for LLStringFn::strip_invalid_xml().
* Changed getpass.getuser() to os.getuid() as getuser() was returning the saved-UID of the process (root user, which kic
ks off parabuild as parabuild u
ser). We want os.getuid() as it correctly returns the parabuild user's uid. / Stupid mistake using os.getuid().. .fixed
by using the pwd module to return the unix username given the userid from os.getuid()
* QAR-623 More single ref attachment awesomeness testing
* Committed temporary fix for running dwell and query-cache on deneb.lindenlab.com, since it's in the DFW colo with the
current asset cluster.
* DEV-15783 Groups not shown in search wont appear in your profile while using webservice
* QAR-642 Even more single ref attachment awesomeness testing

From Branch_1-21-Server (which didn't go directly into release)
* addinng the phputf8 library found from http://phputf8.sourceforge.net/ and liscensed LGPL. For DEV-15202
* Checking in a fix for settle balance portion proc - the event query was moved.
* fix for DEV-15202 - replace non-utf8 with REPLACEMENT CHAR. See jira for more info.
* Checking return value from /proc/vault/charge, must get back a string.
* removed code used for the browser hud AB test.
* Changed TTL from stupid default of 1234 to 5
* DEV-15788  Fixing crashloganalyzer.py cleanup of unparseable crash reports.
* DEV-15737  offline scripted IMs not working inprocess_im_using_ws

Merge conflict resolutions/fixes include:
* Addition of indra/test/llstring_tut.cpp to indra/test/test.vcproj migrated to CMakeLists.txt
* Changes to BuildParams, scripts/automated_build_scripts/* reviewed w/ cg
* Changes to deploy scripts (scripts/farm, install_indra.py, farm_deploy) based on the 1.22 changes except for mkpersist
dir addition (retained from release)
* Changes to scripts/crash_report/crashloganalyzer.py retained from 1.22, per Mani
* scripts/generate_indra_xml.py, etc/services-station.dtd, indra/newsim/llagentinfo.cpp analyzed carefully by josh
* indra/llcommon/llstring.h required fix for client build ("" --> std::basic_string<T>()) in LLStringBase<T> initializer
* indra/llphysics/abstract/llphysicsshape.h #include syntax changed from <llmath/llvolume.h> to "llvolume.h"

Psst, don't tell anyone, but the dataserver-is-deprecated
2008-06-06 22:52:02 +00:00
Bryan O'Sullivan 9db949eec3 svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake-9-merge
dataserver-is-deprecated
for-fucks-sake-whats-with-these-commit-markers
2008-06-02 21:14:31 +00:00
Kelly Washington dc48f1c741 svn merge -r83872:83893 linden/branches/Branch_1-20-0-Server to linden/release
HAVOK4 IN TEH HOUSE!!11!!ONE!!
If it is broken blame Joel for not fixing the loginassetdatabaseinventorygroupIM server instead of working on this.

QAR-448
2008-04-03 22:50:22 +00:00
Josh Bell df4d167cd1 svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release
Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome.
2007-12-21 06:44:41 +00:00
Don Kjer facf67ae32 EFFECTIVE MERGE: svn merge -r 71520:73420 svn+ssh://svn/svn/linden/branches/maintenance-3 into release
ACTUAL MERGE: svn merge -r 75074:75114 svn+ssh://svn/svn/linden/qa/maintenance-3-merge-75067 into release
2007-12-05 23:43:56 +00:00
Aaron Brashears 5595a99623 Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code. 2007-10-04 23:19:43 +00:00
Aaron Brashears 4942a7b779 Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release. 2007-10-04 16:31:48 +00:00
Kelly Washington e03bb0606a merge -r62831:64079 branches/maintenance to release 2007-06-21 22:40:22 +00:00
Karen Clark fceae96eb1 svn merge -r59459:59476 svn+ssh://svn.lindenlab.com/svn/linden/branches/adroit.r69-75_2 into svn+ssh://svn.lindenlab.com/svn/linden/release. 2007-03-20 22:21:42 +00:00
Aaron Brashears 5cc44523f7 Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patches.001 into release. 2007-02-09 23:35:12 +00:00
James Cook 420b91db29 Print done when done. 2007-01-02 08:33:20 +00:00