diff options
Diffstat (limited to 'indra/newview')
5 files changed, 16 insertions, 18 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e1e26372df..d91d2d3f4c 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -131,10 +131,10 @@ #include "stringize.h" #include "llcoros.h" #include "llexception.h" -#if LL_DARWIN || LL_LINUX || __FreeBSD__ +#if 1 // !LL_LINUX #include "cef/dullahan_version.h" -#endif #include "vlc/libvlc_version.h" +#endif // LL_LINUX #if LL_DARWIN #if LL_SDL @@ -987,7 +987,7 @@ bool LLAppViewer::init() return false; } -#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) +#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) || _M_X64 // Without SSE2 support we will crash almost immediately, warn here. if (!gSysCPU.hasSSE2()) { @@ -3431,7 +3431,7 @@ LLSD LLAppViewer::getViewerInfo() const info["VOICE_VERSION"] = LLTrans::getString("NotConnected"); } -#if LL_DARWIN || LL_LINUX || __FreeBSD__ +#if 1 // !LL_LINUX std::ostringstream cef_ver_codec; cef_ver_codec << "Dullahan: "; cef_ver_codec << DULLAHAN_VERSION_MAJOR; @@ -3461,7 +3461,7 @@ LLSD LLAppViewer::getViewerInfo() const info["LIBCEF_VERSION"] = "Undefined"; #endif -//#if !LL_LINUX +#if 1 // !LL_LINUX std::ostringstream vlc_ver_codec; vlc_ver_codec << LIBVLC_VERSION_MAJOR; vlc_ver_codec << "."; @@ -3469,11 +3469,9 @@ LLSD LLAppViewer::getViewerInfo() const vlc_ver_codec << "."; vlc_ver_codec << LIBVLC_VERSION_REVISION; info["LIBVLC_VERSION"] = vlc_ver_codec.str(); -/* #else info["LIBVLC_VERSION"] = "Undefined"; #endif -*/ S32 packets_in = (S32)LLViewerStats::instance().getRecording().getSum(LLStatViewer::PACKETS_IN); if (packets_in > 0) diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml index 66c35558b1..cdbfd4ac56 100644 --- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml +++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_classifieds.xml @@ -36,16 +36,16 @@ left_delta="0" name="classifieds_edit" top="29" - width="651" /> + width="650" /> <combo_box follows="right|top" layout="topleft" height="23" allow_text_entry="false" top_delta="0" - left_pad="2" + left_pad="1" name="classifieds_category" - width="122"> + width="120"> <combo_box.commit_callback function="CommitSearch" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml index 57cb4990e4..00f5de5ed4 100644 --- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml +++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_events.xml @@ -74,15 +74,15 @@ left="6" name="events_edit" top="29" - width="651" /> + width="650" /> <combo_box follows="right|top" layout="topleft" height="23" top_delta="0" - left_pad="2" + left_pad="1" name="events_category" - width="122"> + width="120"> <combo_box.item label="Any Category" name="any" value="0" /> <combo_box.item label="" value="filter_separator" enabled="false" /> <combo_box.item label="Discussion" name="discussion" value="18" /> diff --git a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml index 09c142b8fc..c63818f8e3 100644 --- a/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml +++ b/indra/newview/skins/default/xui/en/panel_fs_search_legacy_places.xml @@ -36,16 +36,16 @@ left_delta="0" name="places_edit" top="29" - width="651" /> + width="650" /> <combo_box follows="right|top" layout="topleft" height="23" allow_text_entry="false" top_delta="0" - left_pad="2" + left_pad="1" name="places_category" - width="122"> + width="120"> <combo_box.commit_callback function="CommitSearch" /> </combo_box> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c5a59fac2a..c3cbfed9fb 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2942,13 +2942,13 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .anim <string name="None">None</string> <string name="Linden Location">Linden Location</string> <string name="Adult">Adult</string> - <string name="Arts&Culture">Arts & Culture</string> + <string name="Arts and Culture">Arts and Culture</string> <string name="Business">Business</string> <string name="Educational">Educational</string> <string name="Gaming">Gaming</string> <string name="Hangout">Hangout</string> <string name="Newcomer Friendly">Newcomer Friendly</string> - <string name="Parks&Nature">Parks & Nature</string> + <string name="Parks and Nature">Parks and Nature</string> <string name="Residential">Residential</string> <!--<string name="Shopping">Shopping</string> --> <string name="Stage">Stage</string> |