Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/siana/SingularityViewer.git

Browse Source
This commit is contained in:
Shyotl
2011-05-03 18:25:31 -05:00
parent e50aa5ab88 d611f6b741
commit 03c98452be
5 changed files with 43 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/llimage/llimagej2c.cpp
View File

@@ -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<bool> 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())

12
indra/newview/app_settings/settings.xml
View File

@@ -9,6 +9,18 @@
<string>settings_rlv.xml</string>
</array>
<key>SianaLegacyJ2CSize</key>
<map>
<key>Comment</key>
<string>Use older JPEG2000 size estimation method</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>SpellDownloadURL</key>
<map>
<key>Comment</key>

59
indra/newview/llpanelavatar.cpp
View File

@@ -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());
}
}

16
indra/newview/skins/default/xui/en-us/panel_preferences_grids.xml
View File

@@ -76,6 +76,22 @@
<combo_box max_chars="20" allow_text_entry="false" name="platform"
height="18" width="200" left="120" bottom_delta="-4"
follows="left|top" mouse_opaque="true" />
<!-- Grid Nickname -->
<text type="string" length="1" enabled="true" name="gridnick_label"
height="10" width="100" left="12" bottom_delta="-22"
h_pad="0" v_pad="0" halign="left"
font="SansSerifSmall"
follows="left|top" bg_visible="false" border_visible="false" mouse_opaque="true"
drop_shadow_visible="true" border_drop_shadow_visible="false">
Grid Nickname:
</text>
<line_editor max_length="25" enabled="false" name="gridnick"
handle_edit_keys_directly="true"
height="18" width="175" left="120" bottom_delta="-4"
halign="right"
font="SansSerifSmall"
follows="left|top" border_visible="false" mouse_opaque="false"
drop_shadow_visible="true" border_drop_shadow_visible="false" />
<!-- Grid Name -->
<text type="string" length="1" enabled="true" name="gridname_label"
height="10" width="100" left="12" bottom_delta="-20"

8
indra/newview/viewer_manifest.py
View File

@@ -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 <bundle>/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")