| Age | Commit message (Collapse) | Author |
|---|
|
Merge ReleaseOS build into Maint U
|
|
to resolve conflicts in installer_template.nsi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Notecard
|
|
|
|
marchcat/SL-19669-upd
|
|
|
|
Translate untranslated parts of Preferences panel.
|
|
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/llcommon/tests/llsdserialize_test.cpp
# indra/newview/llmeshrepository.cpp
|
|
DRTVWR-580-maint-T
|
|
|
|
Chang 'water' translation '水' to '水面'.
Unify the ground translation with '地面' expect land floater.
Fixed mistranslation of widget.
Re-translate panel_settings_sky_density.xml.
|
|
for GCC-friendly tweak to llssize
|
|
|
|
|
|
to pick up new merge from main.
|
|
|
|
for strip_deprecated_header(header_size) and Python llsd module fixes.
|
|
|
|
from U32*.
|
|
(Add Performance floater translation etc.)
Changed 'lighting' translation ('照明' and 'ライティング') to '光源'.
Changed 'world' translation '世界' to 'ワールド'. (To be consistent with 'ミニマップ' translations.)
Adjusted the translation to be more natural Japanese when the settings.xml object passed items. (experimental)
|
|
|
|
|
|
|
|
|
|
|
|
provided by Logue Takacs
|
|
|
|
# Conflicts:
# indra/llcommon/llsdserialize.h
|
|
|
|
(cherry picked from commit eb0516b9940f200b32349d611f38f1ccee48005d)
|
|
|
|
|
|
|
|
Pull in fix to strip_deprecated_header() call.
|
|
Pass llssize instead of S32.
|
|
|
|
|
|
|
|
|
|
|
