diff options
| author | Jacek Antonelli | 2009-11-28 00:04:25 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2009-11-28 00:04:25 -0600 |
| commit | 4bbee8774d743fb4787fc2435a20d89539011fa4 (patch) | |
| tree | 205bc840bc52a4a83526e7441ed3efae3937f5b0 /linden/indra/llcommon | |
| parent | 'FALSE' is supposed to be 'OFF' in develop.py. (diff) | |
| parent | Second Life viewer sources 1.23.5 (diff) | |
| download | meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.zip meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.tar.gz meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.tar.bz2 meta-impy-4bbee8774d743fb4787fc2435a20d89539011fa4.tar.xz | |
Merged SL 1.23.5 into Imprudence.
Conflicts:
linden/indra/cmake/CopyWinLibs.cmake
linden/indra/lib/python/indra/util/llversion.py
linden/indra/llcommon/llversionviewer.h
linden/indra/newview/English.lproj/InfoPlist.strings
linden/indra/newview/Info-Imprudence.plist
linden/indra/newview/llassetuploadresponders.cpp
linden/indra/newview/llpreview.cpp
linden/indra/newview/res/viewerRes.rc
linden/indra/newview/viewer_manifest.py
Diffstat (limited to 'linden/indra/llcommon')
| -rw-r--r-- | linden/indra/llcommon/llversionserver.h | 2 | ||||
| -rw-r--r-- | linden/indra/llcommon/llversionviewer.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/llcommon/llversionserver.h b/linden/indra/llcommon/llversionserver.h index 479b06d..3831479 100644 --- a/linden/indra/llcommon/llversionserver.h +++ b/linden/indra/llcommon/llversionserver.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | const S32 LL_VERSION_MAJOR = 1; | 36 | const S32 LL_VERSION_MAJOR = 1; |
| 37 | const S32 LL_VERSION_MINOR = 27; | 37 | const S32 LL_VERSION_MINOR = 27; |
| 38 | const S32 LL_VERSION_PATCH = 0; | 38 | const S32 LL_VERSION_PATCH = 0; |
| 39 | const S32 LL_VERSION_BUILD = 123523; | 39 | const S32 LL_VERSION_BUILD = 136262; |
| 40 | 40 | ||
| 41 | const char * const LL_CHANNEL = "Second Life Server"; | 41 | const char * const LL_CHANNEL = "Second Life Server"; |
| 42 | 42 | ||
diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h index 18a3182..6f4fffc 100644 --- a/linden/indra/llcommon/llversionviewer.h +++ b/linden/indra/llcommon/llversionviewer.h | |||
| @@ -35,8 +35,8 @@ | |||
| 35 | 35 | ||
| 36 | const S32 LL_VERSION_MAJOR = 1; | 36 | const S32 LL_VERSION_MAJOR = 1; |
| 37 | const S32 LL_VERSION_MINOR = 23; | 37 | const S32 LL_VERSION_MINOR = 23; |
| 38 | const S32 LL_VERSION_PATCH = 4; | 38 | const S32 LL_VERSION_PATCH = 5; |
| 39 | const S32 LL_VERSION_BUILD = 123523; | 39 | const S32 LL_VERSION_BUILD = 136262; |
| 40 | 40 | ||
| 41 | const char * const LL_CHANNEL = "Imprudence"; | 41 | const char * const LL_CHANNEL = "Imprudence"; |
| 42 | 42 | ||