From 1bd669621e08246857148f6e00df0722d343dced Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Sat, 4 Sep 2010 01:19:54 +0200 Subject: disable speedrez by default, because it confuses less advanced users. --- linden/indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 65a6c00..7a1e808 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -582,7 +582,7 @@ Type Boolean Value - 1 + 0 SpeedRezInterval -- cgit v1.1 From 2ab7c40c89c6c19ffd79db4f6a5cf3ab171e31ce Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 3 Sep 2010 15:23:46 +0200 Subject: linux64: fetch 32 bit libraries required for voice --- linden/indra/cmake/ViewerMiscLibs.cmake | 3 +++ linden/indra/newview/viewer_manifest.py | 20 ++++++++++---------- linden/install.xml | 23 +++++++++++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) (limited to 'linden') diff --git a/linden/indra/cmake/ViewerMiscLibs.cmake b/linden/indra/cmake/ViewerMiscLibs.cmake index 7bd306b..4a62ebd 100644 --- a/linden/indra/cmake/ViewerMiscLibs.cmake +++ b/linden/indra/cmake/ViewerMiscLibs.cmake @@ -4,6 +4,9 @@ include(Prebuilt) if (NOT STANDALONE) use_prebuilt_binary(libuuid) use_prebuilt_binary(vivox) + if(LINUX64) + use_prebuilt_binary(32bitcompatibilitylibs) + endif(LINUX64) use_prebuilt_binary(fontconfig) endif(NOT STANDALONE) diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 88ef0ad..d34e9ae 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py @@ -1006,7 +1006,6 @@ class Linux_i686Manifest(LinuxManifest): self.path("libvivoxsdk.so") self.end_prefix("lib") - class Linux_x86_64Manifest(LinuxManifest): def construct(self): super(Linux_x86_64Manifest, self).construct() @@ -1123,14 +1122,6 @@ class Linux_x86_64Manifest(LinuxManifest): self.end_prefix("gstreamer-plugins") self.end_prefix("lib64") -# if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): -# self.path("libalut.so") -# self.path("libidn.so.11") -# self.path("libopenal.so.1") -# self.path("libortp.so") -# self.path("libuuid.so.1") -# self.end_prefix("lib32") - # Vivox runtimes and libs if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): @@ -1138,10 +1129,19 @@ class Linux_x86_64Manifest(LinuxManifest): self.end_prefix("bin") if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"): - self.path("libalut.so") + #self.path("libalut.so") self.path("libortp.so") self.path("libvivoxsdk.so") self.end_prefix("lib32") + + # 32bit libs needed for voice + if self.prefix("../../libraries/x86_64-linux/lib_release_client/32bit-compat", dst="lib32"): + self.path("libalut.so") + self.path("libidn.so.11") + self.path("libopenal.so.1") + # self.path("libortp.so") + self.path("libuuid.so.1") + self.end_prefix("lib32") if __name__ == "__main__": main() diff --git a/linden/install.xml b/linden/install.xml index 221f788..9eaa128 100755 --- a/linden/install.xml +++ b/linden/install.xml @@ -1554,6 +1554,29 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn + 32bitcompatibilitylibs + + copyright + Copyrights: Libidn: Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Simon Josefsson. License GPL v3.0. + Freealut, libuuid, openal-soft: see copyright and license of the + according main packages. + + description + 32bit libraries needed for using voice + license + gpl + packages + + linux64 + + md5sum + cbaafc55fb8b14283541791e82f13462 + url + http://imprudenceviewer.org/download/libs/linux64-32bitcompatibilitylibs-20100903.tar.bz2 + + + xmlrpc-epi copyright -- cgit v1.1 From a52ea919465655871195823b3e04f0552ec190ee Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 3 Sep 2010 20:04:15 -0500 Subject: Fixed dictionaries URL (should be no www). --- linden/indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 7a1e808..2e10768 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -1535,7 +1535,7 @@ Type String Value - http://www.imprudenceviewer.org/app/dics/ + http://imprudenceviewer.org/app/dics/ EmeraldEnableAutoCorrect -- cgit v1.1 From 294d16dcaf6169bc5f968c3f2a8ab6f8f2487ee0 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 3 Sep 2010 21:36:09 -0500 Subject: Fixed other instances of 'www.imprudenceviewer.org'. There is no www. --- linden/indra/newview/app_settings/settings.xml | 2 +- linden/indra/newview/llappviewer.cpp | 2 +- linden/indra/newview/skins/default/xui/en-us/floater_about.xml | 2 +- linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 2e10768..bcf9ef6 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -68,7 +68,7 @@ Type String Value - http://www.imprudenceviewer.org + http://imprudenceviewer.org BrowserLastVisited diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp index 52535bc..b3f3e59 100644 --- a/linden/indra/newview/llappviewer.cpp +++ b/linden/indra/newview/llappviewer.cpp @@ -3229,7 +3229,7 @@ void LLAppViewer::badNetworkHandler() "the issue. \n" " \n" "If the problem continues, please report the issue at: \n" - "www.imprudenceviewer.org" << grid_support_msg; + "http://imprudenceviewer.org" << grid_support_msg; forceDisconnect(message.str()); } diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml index 1370051..1ba9c40 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -9,7 +9,7 @@ word_wrap="true"> The Imprudence Viewer was rocked hard by: Jacek Antonelli, McCabe Maxsted, and Armin Weatherwax. - http://www.imprudenceviewer.org + http://imprudenceviewer.org Imprudence is so awesome thanks to contributions from many generous people: diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml index 1b64878..d15657e 100644 --- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml +++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml @@ -815,12 +815,12 @@ + userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" /> + userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" /> setAddressMode(LLTexUnit::TAM_WRAP); mImagePreloads.insert(image); } - + + std::string id; + + // Preload default avatar eyes + id = gSavedSettings.getString("UIImgDefaultEyesUUID"); + image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id)); + if (image) + { + image->setAddressMode(LLTexUnit::TAM_WRAP); + mImagePreloads.insert(image); + } + + // Preload default avatar hair + id = gSavedSettings.getString("UIImgDefaultHairUUID"); + image = getImageFromFile(id+".j2c",MIPMAP_YES,IMMEDIATE_YES,0,0,LLUUID(id)); + if (image) + { + image->setAddressMode(LLTexUnit::TAM_WRAP); + mImagePreloads.insert(image); + } + } static std::string get_texture_list_name() -- cgit v1.1 From 22cc562720022684340bd80a66292ee3fd0f8dac Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 3 Sep 2010 23:00:36 -0500 Subject: Fixed several issues with the local asset browser. * Enable "Keep Updating" by default. * Fixed the "Keep Updating" checkbox not toggling correctly. * Fixed the upload fee label (it was showing currency symbol). --- linden/indra/newview/floaterlocalassetbrowse.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp index 337a5e6..0ff24ca 100644 --- a/linden/indra/newview/floaterlocalassetbrowse.cpp +++ b/linden/indra/newview/floaterlocalassetbrowse.cpp @@ -106,8 +106,8 @@ LocalBitmap::LocalBitmap(std::string fullpath) /* taking care of basic properties */ this->id.generate(); this->filename = fullpath; - this->linkstatus = LINK_OFF; - this->keep_updating = false; + this->linkstatus = LINK_ON; + this->keep_updating = true; this->shortname = gDirUtilp->getBaseFileName(this->filename, true); this->bitmap_type = TYPE_TEXTURE; this->sculpt_dirty = false; @@ -791,8 +791,8 @@ FloaterLocalAssetBrowser::FloaterLocalAssetBrowser() // checkbox callbacks mUpdateChkBox->setCommitCallback(onClickUpdateChkbox); - mUpdateChkBox->set(true); - mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); + mUpdateChkBox->set(false); + mUploadBtn->setLabelArg("[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee()); } void FloaterLocalAssetBrowser::show(void*) @@ -915,7 +915,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide() sLFInstance->mTypeComboBox->selectNthItem( unit->getType() ); sLFInstance->mTextureView->setEnabled(true); - sLFInstance->mUpdateChkBox->set(true); sLFInstance->mUpdateChkBox->setEnabled(true); sLFInstance->mTypeComboBox->setEnabled(true); } @@ -924,7 +923,6 @@ void FloaterLocalAssetBrowser::UpdateRightSide() { sLFInstance->mTextureView->setImageAssetID( NO_IMAGE ); sLFInstance->mTextureView->setEnabled( false ); - sLFInstance->mUpdateChkBox->set( false ); sLFInstance->mUpdateChkBox->setEnabled( false ); sLFInstance->mTypeComboBox->selectFirstItem(); -- cgit v1.1 From ca4d3f5c76aaa244770a30129a9de94bebc9b9ac Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 30 Aug 2010 18:57:23 -0500 Subject: Switched main viewer font to DejaVu Sans Condensed. Tweaked a few parts of the UI layout to fit the font better. Still no easy way to switch fonts yet. --- linden/indra/newview/app_settings/settings.xml | 4 ++-- .../skins/default/xui/en-us/floater_chat_history.xml | 9 ++++----- .../default/xui/en-us/floater_instant_message_group.xml | 9 ++++----- .../skins/default/xui/en-us/floater_preview_gesture.xml | 8 ++++---- linden/indra/newview/skins/default/xui/en-us/fonts.xml | 16 ++++++++-------- .../skins/default/xui/en-us/panel_preferences_web.xml | 4 ++-- .../newview/skins/default/xui/en-us/panel_toolbar.xml | 4 ++-- linden/indra/newview/viewer_manifest.py | 4 ++++ 8 files changed, 30 insertions(+), 28 deletions(-) (limited to 'linden') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index bcf9ef6..2aec96f 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -6131,7 +6131,7 @@ Type String Value - LiberationSans-Regular.ttf + DejaVuSansCondensed.ttf FontSansSerifBundledFallback @@ -6153,7 +6153,7 @@ Type String Value - LiberationSans-Bold.ttf + DejaVuSansCondensed-Bold.ttf FontSansSerifFallback diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml index 87e1dae..74fe708 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml @@ -81,11 +81,10 @@ -