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

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

Browse Source
This commit is contained in:
Shyotl
2015-01-28 16:39:39 -06:00
parent b247ca3f76 5f3cac46eb
commit 1e07b626c4
20 changed files with 59 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llvfs/lldir_linux.cpp
View File

@@ -93,15 +93,18 @@ LLDir_Linux::LLDir_Linux()
#else #else
mAppRODataDir = tmp_str; mAppRODataDir = tmp_str;
#endif #endif
std::string::size_type build_dir_pos = mExecutableDir.rfind("/indra/viewer-linux-"); std::string::size_type build_dir_pos = mExecutableDir.rfind("/build-linux-");
if (build_dir_pos != std::string::npos) if (build_dir_pos != std::string::npos)
{ {
// ...we're in a dev checkout // ...we're in a dev checkout
mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "/indra/newview/skins"; mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "/indra/newview/skins";
llinfos << "Running in dev checkout with mSkinBaseDir " if (LLFile::isdir(mSkinBaseDir))
<< mSkinBaseDir << llendl; llinfos << "Running in dev checkout with mSkinBaseDir "
<< mSkinBaseDir << LL_ENDL;
else
mSkinBaseDir = "";
} }
else if (mSkinBaseDir.empty())
{ {
// ...normal installation running // ...normal installation running
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins"; mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";

19
indra/llvfs/lldir_win32.cpp
View File

@@ -130,7 +130,7 @@ LLDir_Win32::LLDir_Win32()
{ {
w_str[size] = '\0'; w_str[size] = '\0';
mExecutablePathAndName = utf16str_to_utf8str(llutf16string(w_str)); mExecutablePathAndName = utf16str_to_utf8str(llutf16string(w_str));
S32 path_end = mExecutablePathAndName.find_last_of('\\'); size_t path_end = mExecutablePathAndName.find_last_of('\\');
if (path_end != std::string::npos) if (path_end != std::string::npos)
{ {
mExecutableDir = mExecutablePathAndName.substr(0, path_end); mExecutableDir = mExecutablePathAndName.substr(0, path_end);
@@ -156,6 +156,8 @@ LLDir_Win32::LLDir_Win32()
mAppRODataDir = mWorkingDir; mAppRODataDir = mWorkingDir;
// if (mExecutableDir.find("indra") == std::string::npos)
// *NOTE:Mani - It is a mistake to put viewer specific code in // *NOTE:Mani - It is a mistake to put viewer specific code in
// the LLDir implementation. The references to 'skins' and // the LLDir implementation. The references to 'skins' and
// 'llplugin' need to go somewhere else. // 'llplugin' need to go somewhere else.
@@ -168,20 +170,9 @@ LLDir_Win32::LLDir_Win32()
mAppRODataDir = mExecutableDir; mAppRODataDir = mExecutableDir;
} }
llinfos << "mAppRODataDir = " << mAppRODataDir << llendl; // LL_INFOS() << "mAppRODataDir = " << mAppRODataDir << LL_ENDL;
std::string::size_type build_dir_pos = mExecutableDir.rfind("indra" + mDirDelimiter); mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
if (build_dir_pos != std::string::npos)
{
// ...we're in a dev checkout
mSkinBaseDir = mExecutableDir.substr(0, build_dir_pos) + "indra" + mDirDelimiter + "newview" + mDirDelimiter + "skins";
llinfos << "Running in dev checkout with mSkinBaseDir " << mSkinBaseDir << llendl;
}
else
{
// ...normal installation running
mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
}
// Build the default cache directory // Build the default cache directory
mDefaultCacheDir = buildSLOSCacheDir(); mDefaultCacheDir = buildSLOSCacheDir();

2
indra/newview/linux_tools/client-readme-joystick.txt
View File

@@ -41,7 +41,7 @@ applications such as the Second Life Viewer, as follows:
* Ubuntu or Gentoo Linux Configuration: * Ubuntu or Gentoo Linux Configuration:
For a quick start, you can simply paste the following line into a terminal For a quick start, you can simply paste the following line into a terminal
before plugging in your SpaceNavigator - this only needs to be done once: before plugging in your SpaceNavigator - this only needs to be done once:
sudo bash -c 'echo KERNEL==\"event[0-9]*\", SYSFS{idVendor}==\"046d\", SYSFS{idProduct}==\"c626\", SYMLINK+=\"input/spacenavigator\", GROUP=\"plugdev\", MODE=\"664\" >> /etc/udev/rules.d/91-spacenavigator.rules' sudo bash -c 'echo KERNEL==\"event[0-9]*\", SYSFS{idVendor}==\"046d\", SYSFS{idProduct}==\"c626\", SYMLINK+=\"input/spacenavigator\", GROUP=\"plugdev\", MODE=\"664\" > /etc/udev/rules.d/91-spacenavigator-LL.rules ; echo "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?><deviceinfo version=\"0.2\"><device><match key=\"info.product\" contains=\"3Dconnexion SpaceNavigator\"><merge key=\"input.x11_driver\" type=\"string\"></merge></match></device></deviceinfo>" > /etc/hal/fdi/policy/3Dconnexion_SpaceNavigator_LL.fdi'
For more comprehensive Linux SpaceNavigator configuration information please For more comprehensive Linux SpaceNavigator configuration information please
see the section 'Installing SpaceNavigator without the official driver' here: see the section 'Installing SpaceNavigator without the official driver' here:

20
indra/newview/linux_tools/client-readme-voice.txt
View File

@@ -22,18 +22,10 @@ REQUIREMENTS
-=-=-=-=-=-= -=-=-=-=-=-=
* A headset/microphone supported by your chosen version of Linux * A headset/microphone supported by your chosen version of Linux
* The ALSA sound system (you probably already have this - * At this time, the PulseAudio audio system is recommended; this software
i.e. the alsa-base and alsa-utils packages on Ubuntu) is already part of most modern (2009+) Linux desktop systems. Alternatively,
the ALSA audio system may be used on systems installed from around
Success with Linux Voice support has been reported on the following 2007 onwards (again this is likely already installed on your system).
systems:
* Ubuntu 6.06 (Dapper) with Intel ICH5/CMI9761A+ audio chipset
* Ubuntu 6.06 (Dapper) with SigmaTel STAC2997 audio chipset
* Ubuntu 6.06 (Dapper) with Creative EMU10K1 audio chipset
* Ubuntu 7.04 (Feisty) with USB Plantronics headset
* Ubuntu 7.04 (Feisty) with Intel HDA audio chipset
* Fedora Core 6 with (unknown) audio chipset
* Ubuntu 8.04 (Hardy) with (unknown) audio chipset
TESTING YOUR SETTINGS TESTING YOUR SETTINGS
-=-=-=-=-=-=-=-=-=-=- -=-=-=-=-=-=-=-=-=-=-
@@ -45,8 +37,8 @@ when you speak.
KNOWN PROBLEMS KNOWN PROBLEMS
-=-=-=-=-=-=-= -=-=-=-=-=-=-=
* The 'Input Level' meter in the Voice Chat Device Settings dialog * Compatibility with old ALSA-based audio systems (such as Ubuntu Dapper
does not respond to audio input. from 2006) is poor.
TROUBLESHOOTING TROUBLESHOOTING
-=-=-=-=-=-=-=- -=-=-=-=-=-=-=-

10
indra/newview/linux_tools/client-readme.txt
View File

@@ -55,10 +55,13 @@ Minimum requirements:
is required. If you are running a 64-bit Linux distribution then is required. If you are running a 64-bit Linux distribution then
you will need its 32-bit compatibility environment installed, but you will need its 32-bit compatibility environment installed, but
this configuration is not currently supported. this configuration is not currently supported.
* PulseAudio or ALSA Linux system sound software. A recent PulseAudio
is the recommended configuration; see README-linux-voice.txt for more
information.
* Video/Graphics Card: * Video/Graphics Card:
o nVidia GeForce 2, GeForce 4mx, or better (recommend one of the o nVidia GeForce 2, GeForce 4mx, or better (recommend one of the
following: 6700, 6800, 7600, 7800, 7900, 8400, 8500, 8600, following: 6700, 6800, 7600, 7800, 7900, 8400, 8500, 8600,
8800, Go 7400, Go 7600, Go 7800, Go 7900) 8800, Go 7400, Go 7600, Go 7800, Go 7900, +)
o OR ATI Radeon 8500, 9250, or better o OR ATI Radeon 8500, 9250, or better
(nVidia cards are recommended for the Linux client) (nVidia cards are recommended for the Linux client)
@@ -97,10 +100,7 @@ you wish.
4. KNOWN ISSUES 4. KNOWN ISSUES
-=-=-=-=-=-=-=- -=-=-=-=-=-=-=-
* UPDATING - when the client detects that a new version of Second Life * No significant known issues at this time.
is available, it will ask you if you wish to download the new version.
This option is not implemented; to upgrade, you should manually download a
new version from the Second Life web site, <http://www.secondlife.com/>.
5. TROUBLESHOOTING 5. TROUBLESHOOTING

2
indra/newview/linux_tools/handle_secondlifeprotocol.sh.in
View File

@@ -11,7 +11,7 @@ if [ -z "$URL" ]; then
fi fi
RUN_PATH=`dirname "$0" || echo .` RUN_PATH=`dirname "$0" || echo .`
cd "${RUN_PATH}" cd "${RUN_PATH}/.."
exec ./@VIEWER_BRANDING_ID@ -url \'"${URL}"\' exec ./@VIEWER_BRANDING_ID@ -url \'"${URL}"\'

2
indra/newview/linux_tools/install.sh.in
View File

@@ -77,7 +77,7 @@ function root_install()
install_to_prefix "$install_prefix" install_to_prefix "$install_prefix"
mkdir -p /usr/local/share/applications mkdir -p /usr/local/share/applications
${install_prefix}/refresh_desktop_app_entry.sh ${install_prefix}/etc/refresh_desktop_app_entry.sh
} }
function install_to_prefix() function install_to_prefix()

2
indra/newview/linux_tools/refresh_desktop_app_entry.sh.in
View File

@@ -3,7 +3,7 @@
SCRIPTSRC=`readlink -f "$0" || echo "$0"` SCRIPTSRC=`readlink -f "$0" || echo "$0"`
RUN_PATH=`dirname "${SCRIPTSRC}" || echo .` RUN_PATH=`dirname "${SCRIPTSRC}" || echo .`
install_prefix=${RUN_PATH} install_prefix=${RUN_PATH}/..
function install_desktop_entry() function install_desktop_entry()
{ {

10
indra/newview/linux_tools/wrapper.sh.in
View File

@@ -109,10 +109,10 @@ echo "Running from ${RUN_PATH}"
cd "${RUN_PATH}" cd "${RUN_PATH}"
# Re-register the secondlife:// protocol handler every launch, for now. # Re-register the secondlife:// protocol handler every launch, for now.
./register_secondlifeprotocol.sh ./etc/register_secondlifeprotocol.sh
# Re-register the application with the desktop system every launch, for now. # Re-register the application with the desktop system every launch, for now.
./refresh_desktop_app_entry.sh ./etc/refresh_desktop_app_entry.sh
## Before we mess with LD_LIBRARY_PATH, save the old one to restore for ## Before we mess with LD_LIBRARY_PATH, save the old one to restore for
## subprocesses that care. ## subprocesses that care.
@@ -144,10 +144,10 @@ fi
export VIEWER_BINARY='@VIEWER_BRANDING_ID@-do-not-run-directly' export VIEWER_BINARY='@VIEWER_BRANDING_ID@-do-not-run-directly'
BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/ / /g') BINARY_TYPE=$(expr match "$(file -b bin/$VIEWER_BINARY)" '\(.*executable\)' | sed -e 's/ / /g')
if [ "${BINARY_TYPE}" == "ELF 64-bit LSB executable" ]; then if [ "${BINARY_TYPE}" == "ELF 32-bit LSB executable" ]; then
SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib64:`pwd`/lib32:$LD_LIBRARY_PATH"' SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"'
else else
SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"' SL_ENV+='LD_LIBRARY_PATH="`pwd`/lib64:`pwd`/lib32:$LD_LIBRARY_PATH"'
fi fi
export SL_CMD='$LL_WRAPPER bin/$VIEWER_BINARY' export SL_CMD='$LL_WRAPPER bin/$VIEWER_BINARY'

34
indra/newview/llfloaterchat.cpp
View File

@@ -112,7 +112,11 @@ BOOL LLFloaterChat::postBuild()
{ {
mPanel = getChild<LLParticipantList>("active_speakers_panel"); mPanel = getChild<LLParticipantList>("active_speakers_panel");
getChild<LLUICtrl>("toggle_active_speakers_btn")->setCommitCallback(boost::bind(&LLFloaterChat::onClickToggleActiveSpeakers, this, _2)); // [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
getChild<LLUICtrl>("toggle_active_speakers_btn")->setCommitCallback(boost::bind(&LLView::setVisible, mPanel, boost::bind(std::logical_and<bool>(), _2, !boost::bind(&RlvHandler::hasBehaviour, boost::ref(gRlvHandler), RLV_BHVR_SHOWNAMES))));
// [/RLVa:KB]
//getChild<LLUICtrl>("toggle_active_speakers_btn")->setCommitCallback(boost::bind(&LLView::setVisible, mPanel, _2));
mChatPanel.connect(this,"chat_panel"); mChatPanel.connect(this,"chat_panel");
mChatPanel->setGestureCombo(getChild<LLComboBox>( "Gesture")); mChatPanel->setGestureCombo(getChild<LLComboBox>( "Gesture"));
return TRUE; return TRUE;
@@ -496,21 +500,11 @@ LLColor4 get_text_color(const LLChat& chat, bool from_im)
} }
} }
static const LLCachedControl<bool> mKeywordsChangeColor(gSavedPerAccountSettings, "KeywordsChangeColor", false); static const LLCachedControl<bool> sKeywordsChangeColor(gSavedPerAccountSettings, "KeywordsChangeColor", false);
static const LLCachedControl<LLColor4> mKeywordsColor(gSavedPerAccountSettings, "KeywordsColor", LLColor4(1.f, 1.f, 1.f, 1.f)); if (sKeywordsChangeColor && gAgentID != chat.mFromID && chat.mSourceType != CHAT_SOURCE_SYSTEM && AscentKeyword::hasKeyword(chat.mText.substr(chat.mFromName.length()), 1))
if ((gAgent.getID() != chat.mFromID) && (chat.mSourceType != CHAT_SOURCE_SYSTEM))
{ {
if (mKeywordsChangeColor) static const LLCachedControl<LLColor4> sKeywordsColor(gSavedPerAccountSettings, "KeywordsColor", LLColor4(1.f, 1.f, 1.f, 1.f));
{ text_color = sKeywordsColor;
std::string shortmsg(chat.mText);
shortmsg.erase(0, chat.mFromName.length());
if (AscentKeyword::hasKeyword(shortmsg, 1))
{
text_color = mKeywordsColor;
}
}
} }
return text_color; return text_color;
@@ -556,16 +550,6 @@ void* LLFloaterChat::createChatPanel(void* data)
return new LLChatBar; return new LLChatBar;
} }
// static
void LLFloaterChat::onClickToggleActiveSpeakers(const LLSD& val)
{
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
mPanel->setVisible(val && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
// [/RLVa:KB]
//mPanel->setVisible(val);
}
//static //static
bool LLFloaterChat::visible(LLFloater* instance, const LLSD& key) bool LLFloaterChat::visible(LLFloater* instance, const LLSD& key)
{ {

1
indra/newview/llfloaterchat.h
View File

@@ -71,7 +71,6 @@ public:
static void triggerAlerts(const std::string& text); static void triggerAlerts(const std::string& text);
void onClickToggleShowMute(bool show_mute, class LLTextEditor* history_editor, LLTextEditor* history_editor_with_mute); void onClickToggleShowMute(bool show_mute, class LLTextEditor* history_editor, LLTextEditor* history_editor_with_mute);
void onClickToggleActiveSpeakers(const LLSD& val);
static void chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata); static void chatFromLogFile(LLLogChat::ELogLineType type, std::string line, void* userdata);
static void loadHistory(); static void loadHistory();
static void* createSpeakersPanel(void* data); static void* createSpeakersPanel(void* data);

9
indra/newview/llimpanel.cpp
View File

@@ -510,7 +510,7 @@ BOOL LLFloaterIMPanel::postBuild()
getChild<LLButton>("end_call_btn")->setCommitCallback(boost::bind(&LLIMMgr::endCall, gIMMgr, boost::ref(mSessionUUID))); getChild<LLButton>("end_call_btn")->setCommitCallback(boost::bind(&LLIMMgr::endCall, gIMMgr, boost::ref(mSessionUUID)));
getChild<LLButton>("send_btn")->setCommitCallback(boost::bind(&LLFloaterIMPanel::onSendMsg,this)); getChild<LLButton>("send_btn")->setCommitCallback(boost::bind(&LLFloaterIMPanel::onSendMsg,this));
if (LLButton* btn = findChild<LLButton>("toggle_active_speakers_btn")) if (LLButton* btn = findChild<LLButton>("toggle_active_speakers_btn"))
btn->setCommitCallback(boost::bind(&LLFloaterIMPanel::onClickToggleActiveSpeakers, this, _2)); btn->setCommitCallback(boost::bind(&LLView::setVisible, getChildView("active_speakers_panel"), _2));
mHistoryEditor = getChild<LLViewerTextEditor>("im_history"); mHistoryEditor = getChild<LLViewerTextEditor>("im_history");
mHistoryEditor->setParseHTML(TRUE); mHistoryEditor->setParseHTML(TRUE);
@@ -600,8 +600,6 @@ void LLFloaterIMPanel::draw()
if (mSpeakerPanel) mSpeakerPanel->setVisible(true); if (mSpeakerPanel) mSpeakerPanel->setVisible(true);
mShowSpeakersOnConnect = false; mShowSpeakersOnConnect = false;
} }
if (LLUICtrl* ctrl = findChild<LLUICtrl>("toggle_active_speakers_btn"))
ctrl->setValue(getChildView("active_speakers_panel")->getVisible());
if (mTyping) if (mTyping)
{ {
@@ -1031,11 +1029,6 @@ void LLFloaterIMPanel::onClickHistory()
} }
} }
void LLFloaterIMPanel::onClickToggleActiveSpeakers(const LLSD& value)
{
childSetVisible("active_speakers_panel", !value);
}
void LLFloaterIMPanel::onInputEditorFocusReceived() void LLFloaterIMPanel::onInputEditorFocusReceived()
{ {
if (gSavedSettings.getBOOL("LiruLegacyScrollToEnd")) if (gSavedSettings.getBOOL("LiruLegacyScrollToEnd"))

1
indra/newview/llimpanel.h
View File

@@ -105,7 +105,6 @@ public:
void onClickHistory(); void onClickHistory();
void onFlyoutCommit(class LLComboBox* flyout, const LLSD& value); void onFlyoutCommit(class LLComboBox* flyout, const LLSD& value);
void onClickToggleActiveSpeakers(const LLSD& value);
static void* createSpeakersPanel(void* data); static void* createSpeakersPanel(void* data);
//callbacks for P2P muting and volume control //callbacks for P2P muting and volume control

2
indra/newview/skins/default/xui/en-us/floater_chat_history.xml
View File

@@ -18,7 +18,7 @@
<check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="124" name="show mutes" width="116"/> <check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="124" name="show mutes" width="116"/>
<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100" control_name="TranslateChat"/--> <!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100" control_name="TranslateChat"/-->
<button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/> <button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_tip="Click here to open chat history in external editor."/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" toggle="true" left="272" name="toggle_active_speakers_btn" right="305" tool_tip="Click here to show a list of active participants in this IM session." width="80"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/> <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/> <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="0" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="107" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
</layout_panel> </layout_panel>

2
indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
View File

@@ -16,7 +16,7 @@
</button> </button>
<button bottom_delta="0" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="50" name="start_call_btn" width="80"/> <button bottom_delta="0" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="50" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="left|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/> <button bottom_delta="0" follows="left|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" toggle="true" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/> <text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to instant message" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/> <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to instant message" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
<button bottom_delta="0" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/> <button bottom_delta="0" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>

2
indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc_concisebuttons.xml
View File

@@ -14,7 +14,7 @@
</button> </button>
<button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="50" name="start_call_btn" width="80"/> <button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="50" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/> <button bottom_delta="0" follows="right|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" toggle="true" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels"> <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495"> <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495">
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="160" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/> <text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="160" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>

2
indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
View File

@@ -19,7 +19,7 @@
</button> </button>
<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="50" name="start_call_btn" width="80"/> <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="50" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/> <button bottom_delta="0" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" toggle="true" left="462" name="toggle_active_speakers_btn" right="495" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/> <text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="143" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" height="20" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/> <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right|bottom" font="SansSerif" height="20" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="425" spell_check="true"/>
<button bottom="5" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/> <button bottom="5" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>

2
indra/newview/skins/default/xui/en-us/floater_instant_message_group_concisebuttons.xml
View File

@@ -17,7 +17,7 @@
</button> </button>
<button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="50" name="start_call_btn" width="80"/> <button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="50" name="start_call_btn" width="80"/>
<button bottom_delta="0" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/> <button bottom_delta="0" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/>
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" toggle="true" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels"> <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="180" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495"> <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="195" left="0" min_width="115" name="im_contents_panel" width="495">
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="160" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/> <text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="160" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>

8
indra/newview/skins/default/xui/en-us/notifications.xml
View File

@@ -1546,6 +1546,14 @@ The region [REGION] does not allow terraforming.
<tag>fail</tag> <tag>fail</tag>
</notification> </notification>
<notification
icon="alertmodal.tga"
name="ParcelNoTerraforming"
type="notify">
You are not allowed to terraform parcel [PARCEL].
<tag>fail</tag>
</notification>
<notification <notification
icon="alertmodal.tga" icon="alertmodal.tga"
name="CannotCopyWarning" name="CannotCopyWarning"

8
indra/newview/viewer_manifest.py
View File

@@ -777,7 +777,7 @@ class LinuxManifest(ViewerManifest):
self.end_prefix("bin/llplugin") self.end_prefix("bin/llplugin")
# llcommon # llcommon
if not self.path("../llcommon/libllcommon.so", "lib/libllcommon.so"): if not self.path("../llcommon/libllcommon.so", "lib64/libllcommon.so"):
print "Skipping llcommon.so (assuming llcommon was linked statically)" print "Skipping llcommon.so (assuming llcommon was linked statically)"
self.path("featuretable_linux.txt") self.path("featuretable_linux.txt")
@@ -900,7 +900,7 @@ class Linux_x86_64Manifest(LinuxManifest):
def construct(self): def construct(self):
super(Linux_x86_64Manifest, self).construct() super(Linux_x86_64Manifest, self).construct()
if (not self.standalone()) and self.prefix(src="../packages/lib/release", alt_build="../packages/libraries/x86_64-linux/lib/release", dst="lib"): if (not self.standalone()) and self.prefix(src="../packages/lib/release", alt_build="../packages/libraries/x86_64-linux/lib/release", dst="lib64"):
self.path("libapr-1.so*") self.path("libapr-1.so*")
self.path("libaprutil-1.so*") self.path("libaprutil-1.so*")
@@ -933,9 +933,9 @@ class Linux_x86_64Manifest(LinuxManifest):
self.path("libboost_system-mt.so.*") self.path("libboost_system-mt.so.*")
self.path("libboost_thread-mt.so.*") self.path("libboost_thread-mt.so.*")
self.end_prefix("lib") self.end_prefix("lib64")
if (not self.standalone()) and self.prefix(src='', alt_build="../packages/lib/release", dst="lib"): if (not self.standalone()) and self.prefix(src='', alt_build="../packages/lib/release", dst="lib64"):
self.add_extra_libraries() self.add_extra_libraries()
self.end_prefix() self.end_prefix()