livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Tonya Souther 2011-05-25 16:05:43 -05:00
parent f90398d9df 5403e4a8ef
commit 173e695606
10 changed files with 58 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2293,6 +2293,17 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>ClickOnAvatarKeepsCamera</key>
<map>
<key>Comment</key>
<string>Normally, clicking on your avatar resets the camera position. This option removes this behavior..</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>CreateToolCopyCenters</key>
<map>
<key>Comment</key>

15
indra/newview/fscontactsfloater.cpp
View File

@ -44,8 +44,10 @@
#include "llfriendcard.h"
#include "llgroupactions.h"
#include "llgrouplist.h"
#include "llimfloatercontainer.h"
#include "llsidetray.h"
#include "llstartup.h"
#include "llviewercontrol.h"
static const std::string FRIENDS_TAB_NAME = "friends_panel";
static const std::string GROUP_TAB_NAME = "groups_panel";
@ -153,6 +155,19 @@ void FSFloaterContacts::updateButtons()
void FSFloaterContacts::onOpen(const LLSD& key)
{
if (gSavedSettings.getBOOL("ContactsTornOff"))
{
LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
// first set the tear-off host to the conversations container
setHost(floater_container);
// clear the tear-off host right after, the "last host used" will still stick
setHost(NULL);
// reparent to floater view
gFloaterView->addChild(this);
// and remember we are torn off
setTornOff(TRUE);
}
if (key.asString() == "friends")
{
childShowTab("friends_and_groups", "friends_panel");

18
indra/newview/llimfloater.cpp
View File

@ -633,6 +633,10 @@ BOOL LLIMFloater::postBuild()
LLButton* add_friend = getChild<LLButton>("add_friend_btn");
add_friend->setClickedCallback(boost::bind(&LLIMFloater::onAddFriendButtonClicked, this));
// support sysinfo button -Zi
mSysinfoButton=getChild<LLButton>("send_sysinfo_btn");
onSysinfoButtonVisibilityChanged(FALSE);
// extra icon controls -AO
LLButton* transl = getChild<LLButton>("translate_btn");
//TT
@ -671,7 +675,6 @@ BOOL LLIMFloater::postBuild()
}
// support sysinfo button -Zi
mSysinfoButton=getChild<LLButton>("send_sysinfo_btn");
mSysinfoButton->setClickedCallback(boost::bind(&LLIMFloater::onSysinfoButtonClicked, this));
// this needs to be extended to fsdata awareness, once we have it. -Zi
// mIsSupportIM=fsdata(partnerUUID).isSupport(); // pseudocode something like this
@ -896,19 +899,8 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)
{
LLIMFloaterContainer* floater_container = LLIMFloaterContainer::getInstance();
if (gSavedSettings.getBOOL("ContactsTornOff"))
{
// first set the tear-off host to the conversations container
floater->setHost(floater_container);
// clear the tear-off host right after, the "last host used" will still stick
floater->setHost(NULL);
// reparent to floater view
gFloaterView->addChild(floater);
// and remember we are torn off
floater->setTornOff(TRUE);
}
// do not add existed floaters to avoid adding torn off instances
else if (!exist)
if (!exist)
{
// LLTabContainer::eInsertionPoint i_pt = user_initiated ? LLTabContainer::RIGHT_OF_CURRENT : LLTabContainer::END;
// TODO: mantipov: use LLTabContainer::RIGHT_OF_CURRENT if it exists

2
indra/newview/llimhandler.cpp
View File

@ -182,7 +182,7 @@ bool LLIMHandler::processNotification(const LLSD& notify)
LLToastIMPanel::Params im_p;
im_p.notification = notification;
im_p.avatar_id = avatar_id;
im_p.from = substitutions["c"].asString();
im_p.from = substitutions["FROM"].asString();
im_p.time = substitutions["TIME"].asString();
im_p.message = substitutions["MESSAGE"].asString();
im_p.session_id = substitutions["SESSION_ID"].asUUID();

3
indra/newview/lltoolpie.cpp
View File

@ -360,7 +360,8 @@ BOOL LLToolPie::pickLeftMouseDownCallback()
gViewerWindow->hideCursor();
LLToolCamera::getInstance()->setMouseCapture(TRUE);
LLToolCamera::getInstance()->pickCallback(mPick);
gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
if(!gSavedSettings.getBOOL("ClickOnAvatarKeepsCamera")) // keep camera in place when clicking on ourselves -Zi
gAgentCamera.setFocusOnAvatar(TRUE, TRUE);
return TRUE;
}

5
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -187,6 +187,7 @@
</text>
<radio_group
control_name="LetterKeysFocusChatBar"
width="310"
height="16"
layout="topleft"
left_delta="120"
@ -234,7 +235,7 @@
control_name="ChatWindow"
name="chat_window"
tool_tip="Show your Instant Messages in separate floaters, or in one floater with many tabs (Requires restart)"
width="110">
width="180">
<radio_item
height="16"
label="Separate windows"
@ -257,7 +258,7 @@
name="req_restart"
follows="left|top"
layout="topleft"
left_pad="100"
left_pad="10"
top_delta="0"
text_color="White_50"
height="16"

16
indra/newview/skins/default/xui/en/panel_preferences_firestorm.xml
View File

@ -155,7 +155,21 @@
width="270"
control_name="TurnAroundWhenWalkingBackwards"
tool_tip="Turns your avatar around to face the camera when you are walking backwards."/>
<check_box bottom_delta="-20"
follows="left|top"
font="SansSerifSmall"
height="16"
initial_value="false"
label="Clicking your avatar keeps camera position"
left="15"
mouse_opaque="true"
name="backwardsturnavatar"
radio_style="false"
width="270"
control_name="ClickOnAvatarKeepsCamera"
tool_tip="Normally, clicking on your avatar resets the camera position. This option removes this behavior."/>
<text
type="string"
length="1"

62
indra/newview/skins/metaharper/xui/en/language_settings.xml
View File

@ -1,62 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- This file contains strings that used to be hardcoded in the source.-->
<strings>
<!-- Locale Information -->
<string name="MicrosoftLocale">english</string>
<string name="DarwinLocale">C</string>
<string name="LinuxLocale">C</string>
<!-- Note: for plural nouns, see strings.xml. For example:
AgeYearsA = singular,
AgeYearsB = plural,
AgeYearsC = plural for non-English languages like Russian
For example, LLTrans::getCountString("AgeYears", 3) is plural form B
in English and form C in Russian -->
<!--
datetimeToCodes["wkday"] = "%a"; // Thu
datetimeToCodes["weekday"] = "%A"; // Thursday
datetimeToCodes["year4"] = "%Y"; // 2009
datetimeToCodes["year"] = "%Y"; // 2009
datetimeToCodes["year2"] = "%y"; // 09
datetimeToCodes["mth"] = "%b"; // Aug
datetimeToCodes["month"] = "%B"; // August
datetimeToCodes["mthnum"] = "%m"; // 08
datetimeToCodes["day"] = "%d"; // 31
datetimeToCodes["sday"] = "%-d"; // 9
datetimeToCodes["hour24"] = "%H"; // 14
datetimeToCodes["hour"] = "%H"; // 14
datetimeToCodes["hour12"] = "%I"; // 02
datetimeToCodes["min"] = "%M"; // 59
datetimeToCodes["ampm"] = "%p"; // AM
datetimeToCodes["second"] = "%S"; // 59
datetimeToCodes["timezone"] = "%Z"; // PST
-->
<string name="TimeHour">hour,datetime,slt</string>
<string name="TimeMin">min,datetime,slt</string>
<string name="TimeYear">year,datetime,slt</string>
<string name="TimeDay">day,datetime,slt</string>
<string name="TimeMonth">mthnum,datetime,slt</string>
<string name="TimeWeek">wkday,datetime,slt</string>
<string name="TimeAMPM">ampm,datetime,slt</string>
<string name="TimeHour12">hour12,datetime,slt</string>
<string name="LTimeMthNum">mthnum,datetime,local</string>
<string name="LTimeWeek">wkday,datetime,local</string>
<string name="LTimeMonth">mth,datetime,local</string>
<string name="LTimeDay">day,datetime,local</string>
<string name="LTimeSec">second,datetime,local</string>
<string name="LTimeHour">hour,datetime,local</string>
<string name="LTimeMin">min,datetime,local</string>
<string name="LTimeYear">year,datetime,local</string>
<string name="UTCTimeWeek">weekday,datetime,utc</string>
<string name="UTCTimeDay">day,datetime,utc</string>
<string name="UTCTimeMth">mth,datetime,utc</string>
<string name="UTCTimeYr">year,datetime,utc</string>
<string name="UTCTimeHr">hour,datetime,utc</string>
<string name="UTCTimeMin">min,datetime,utc</string>
<string name="UTCTimeSec">second,datetime,utc</string>
<string name="UTCTimeTimezone">timezone,datetime,utc</string>
</strings>

102
indra/newview/skins/metaharper/xui/en/panel_group_notify.xml
View File

@ -1,102 +0,0 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel
background_visible="true"
height="90"
label="instant_message"
layout="topleft"
left="0"
name="panel_group_notify"
top="0"
width="305">
<string
name="message_max_lines_count"
value="7" />
<string
name="subject_font"
value="SANSSERIF_BIG" />
<string
name="date_font"
value="SANSSERIF" />
<panel
background_visible="true"
follows="top"
height="30"
label="header"
layout="topleft"
left="0"
name="header"
top="0"
width="305">
<icon
follows="all"
height="20"
layout="topleft"
left="5"
mouse_opaque="true"
name="group_icon"
top="5"
width="20" />
<text
follows="all"
font="SansSerifBig"
height="20"
layout="topleft"
left_pad="10"
name="title"
text_color="GroupNotifyTextColor"
top="5"
use_ellipses="true"
value="Sender Name / Group Name"
width="230" />
</panel>
<text_editor
parse_urls="true"
enabled="true"
follows="all"
height="0"
layout="topleft"
left="25"
max_length="67108864"
name="message"
parse_highlights="true"
read_only="true"
text_color="GroupNotifyTextColor"
top="40"
type="string"
use_ellipses="true"
value="message"
width="270"
word_wrap="true" >
</text_editor>
<icon
bottom="60"
follows="left|bottom|right"
height="15"
layout="topleft"
left="25"
mouse_opaque="true"
name="attachment_icon"
width="15" />
<text
bottom="60"
follows="left|bottom|right"
font="SansSerif"
height="15"
layout="topleft"
left="45"
name="attachment"
parse_urls="false"
text_color="GroupNotifyTextColor"
value="Attachment"
use_ellipses="true"
width="250" />
<button
bottom="85"
follows="bottom"
height="20"
label="OK"
layout="topleft"
right="-10"
name="btn_ok"
width="70" />
</panel>

12
indra/newview/skins/skins.xml
View File

@ -88,12 +88,6 @@
<string>starlight</string>
<key>themes</key>
<array>
<map>
<key>name</key>
<string>Nostalgia Blue</string>
<key>folder</key>
<string>nostalgia_blue</string>
</map>
<map>
<key>name</key>
<string>Original Orange</string>
@ -107,6 +101,12 @@
<string>original_teal</string>
</map>
<map>
<key>name</key>
<string>Nostalgia Blue</string>
<key>folder</key>
<string>nostalgia_blue</string>
</map>
<map>
<key>name</key>
<string>Silver Blue</string>
<key>folder</key>