diff options
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | doc/translations.txt | 7 | ||||
| -rwxr-xr-x | indra/llcommon/llversionviewer.h | 2 | ||||
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 2 |
4 files changed, 8 insertions, 4 deletions
@@ -184,3 +184,4 @@ f2412ecd6740803ea9452f1d17fd872e263a0df7 3.0.2-start e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e DRTVWR-86_3.0.2-beta2 e5c9af2d7980a99a71650be3a0cf7b2b3c3b897e 3.0.2-beta2 b95ddac176ac944efdc85cbee94ac2e1eab44c79 3.0.3-start +586907287be581817b2422b5137971b22d54ea48 3.0.4-start diff --git a/doc/translations.txt b/doc/translations.txt index c9cfc1cdeb..9b7f2d6292 100644 --- a/doc/translations.txt +++ b/doc/translations.txt @@ -1,7 +1,9 @@ -#List of translators who contribute to SL Viewer 2.0+ and SL web translation by language +#List of translators who contribute to SL Viewer 2.0+ by language Danish Flemming Congrejo + German +Torben Trautman French Valerie Linden Polish @@ -21,6 +23,7 @@ Lunita Savira Minerva Memel Polo Gufler Xiki Luik -Perez Linden +Shinya Tandino +Catwise Yoshikawa Traditional Chinese gefeit Dufaux diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index 324507fe7a..ef55cfec89 100755 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -29,7 +29,7 @@ const S32 LL_VERSION_MAJOR = 3; const S32 LL_VERSION_MINOR = 0; -const S32 LL_VERSION_PATCH = 4; +const S32 LL_VERSION_PATCH = 5; const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Developer"; diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index bfd8095c42..0996f75fbb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -25,7 +25,7 @@ <key>Type</key> <string>S32</string> <key>Value</key> - <real>300</real> + <real>0</real> </map> <key>AdminMenu</key> <map> |