From 5fd1312ae04605b222ab986c7d5d1d5d91439249 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Mon, 2 May 2011 02:21:26 +0200 Subject: [PATCH 1/4] Restoring grid nickname in manager --- .../xui/en-us/panel_preferences_grids.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml index 69533f1cc..786f763f3 100644 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml @@ -76,6 +76,22 @@ + + + Grid Nickname: + + Date: Tue, 3 May 2011 23:49:00 +0200 Subject: [PATCH 2/4] J2C stream length estimation back to old --- indra/llimage/llimagej2c.cpp | 7 +++++++ indra/newview/app_settings/settings.xml | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp index 08bcde633..fbfb91697 100644 --- a/indra/llimage/llimagej2c.cpp +++ b/indra/llimage/llimagej2c.cpp @@ -34,6 +34,7 @@ #include "apr_dso.h" #include "lldir.h" +#include "../llxml/llcontrol.h" #include "llimagej2c.h" #include "llmemtype.h" @@ -382,6 +383,12 @@ S32 LLImageJ2C::calcHeaderSize() // to load discard_level (including header and higher discard levels) S32 LLImageJ2C::calcDataSize(S32 discard_level) { + static const LLCachedControl legacy_size("SianaLegacyJ2CSize", false); + + if (legacy_size) { + return calcDataSizeJ2C(getWidth(), getHeight(), getComponents(), discard_level, mRate); + } + discard_level = llclamp(discard_level, 0, MAX_DISCARD_LEVEL); if ( mAreaUsedForDataSizeCalcs != (getHeight() * getWidth()) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index c4b11eb8c..038090663 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9,6 +9,18 @@ settings_rlv.xml + SianaLegacyJ2CSize + + Comment + Use older JPEG2000 size estimation method + Persist + 1 + Type + Boolean + Value + 1 + + SpellDownloadURL Comment From 44cf22210442152afa97903121c148d7d64b2f9b Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 4 May 2011 00:03:55 +0200 Subject: [PATCH 3/4] Now can offer teleport to anyone --- indra/newview/llpanelavatar.cpp | 59 +-------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp index be9431e69..52e812924 100644 --- a/indra/newview/llpanelavatar.cpp +++ b/indra/newview/llpanelavatar.cpp @@ -726,15 +726,6 @@ void LLPanelAvatarWeb::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent ev } } - - - - - - - - - //----------------------------------------------------------------------------- // LLPanelAvatarAdvanced //----------------------------------------------------------------------------- @@ -1434,44 +1425,6 @@ void LLPanelAvatar::onCommitKey(LLUICtrl* ctrl, void* data) self->setAvatarID(av_key, LLStringUtil::null, ONLINE_STATUS_NO); } - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status) { // Online status NO could be because they are hidden @@ -1483,13 +1436,6 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status) online_status = ONLINE_STATUS_YES; } - - - - - - - if(online_status == ONLINE_STATUS_YES) { mPanelSecondLife->childSetVisible("online_yes", TRUE); @@ -1505,9 +1451,6 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status) childSetVisible("Offer Teleport...",TRUE); } - - - BOOL in_prelude = gAgent.inPrelude(); if(gAgent.isGodlike()) { @@ -1521,7 +1464,7 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status) } else { - childSetEnabled("Offer Teleport...", (online_status == ONLINE_STATUS_YES)); + childSetEnabled("Offer Teleport...", TRUE /*(online_status == ONLINE_STATUS_YES)*/); childSetToolTip("Offer Teleport...", childGetValue("TeleportNormal").asString()); } } From d611f6b7411bf6af52a2fef70ca4ad209a44db37 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 4 May 2011 00:07:32 +0200 Subject: [PATCH 4/4] Adding hunspell dll/so/dylib --- indra/newview/viewer_manifest.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index e560b7b46..22ed21392 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -56,7 +56,6 @@ class ViewerManifest(LLManifest): # include the entire shaders directory recursively self.path("shaders") - self.path("dictionaries") # ... and the entire windlight directory self.path("windlight") self.end_prefix("app_settings") @@ -199,6 +198,11 @@ class WindowsManifest(ViewerManifest): self.path("featuretable.txt") + # For spellchecking + if self.prefix(src=self.args['configuration'], dst=""): + self.path("libhunspell.dll") + self.end_prefix() + # For use in crash reporting (generates minidumps) self.path("dbghelp.dll") @@ -439,6 +443,7 @@ class DarwinManifest(ViewerManifest): self.path(self.info_plist_name(), dst="Info.plist") # copy additional libs in /Contents/MacOS/ + self.path("../../libraries/universal-darwin/lib_release/libhunspell-1.2.dylib", dst="MacOS/libhunspell-1.2.dylib") self.path("../../libraries/universal-darwin/lib_release/libndofdev.dylib", dst="MacOS/libndofdev.dylib") self.path("../../libraries/universal-darwin/lib_release/libvorbisenc.2.dylib", dst="MacOS/libvorbisenc.2.dylib") self.path("../../libraries/universal-darwin/lib_release/libvorbisfile.3.dylib", dst="MacOS/libvorbisfile.3.dylib") @@ -785,6 +790,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdb-4.2.so") self.path("libcrypto.so.0.9.7") self.path("libexpat.so.1") + self.path("libhunspell-1.2.so.0.0.0", "libhunspell-1.2.so.0") self.path("libssl.so.0.9.7") #self.path("libuuid.so.1") self.path("libSDL-1.2.so.0")