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

PE merge.

meow-7.2.2
Tofu Linden 2010-02-09 19:41:35 +00:00
parent 9a19daccd0 d3d389c698
commit bc9122feb9
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,17 +177,6 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>FirstStreamingMedia</key>
<map>
<key>Comment</key>
<string>Enables FirstStreamingMedia warning dialog</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FirstTeleport</key>
<map>
<key>Comment</key>

1
indra/newview/llappviewer.cpp
View File

@ -1933,7 +1933,6 @@ bool LLAppViewer::initConfiguration()
// LLFirstUse::addConfigVariable("FirstSandbox");
// LLFirstUse::addConfigVariable("FirstFlexible");
// LLFirstUse::addConfigVariable("FirstDebugMenus");
// LLFirstUse::addConfigVariable("FirstStreamingMedia");
// LLFirstUse::addConfigVariable("FirstSculptedPrim");
// LLFirstUse::addConfigVariable("FirstVoice");
// LLFirstUse::addConfigVariable("FirstMedia");

4
indra/newview/llcallfloater.cpp
View File

@ -303,8 +303,8 @@ void LLCallFloater::updateSession()
refreshParticipantList();
updateAgentModeratorState();
//show floater for voice calls
if (!is_local_chat)
//show floater for voice calls & only in CONNECTED to voice channel state
if (!is_local_chat && LLVoiceChannel::STATE_CONNECTED == voice_channel->getState())
{
LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
bool show_me = !(im_floater && im_floater->getVisible());

2
indra/newview/llchathistory.cpp
View File

@ -116,7 +116,7 @@ public:
//*TODO remake it using mouse enter/leave and static LLHandle<LLIconCtrl> to add/remove as a child
BOOL handleToolTip(S32 x, S32 y, MASK mask)
{
LLViewerTextEditor* name = getChild<LLViewerTextEditor>("user_name");
LLTextBase* name = getChild<LLTextBase>("user_name");
if (name && name->parentPointInView(x, y) && mAvatarID.notNull() && SYSTEM_FROM != mFrom)
{

9
indra/newview/llimview.cpp
View File

@ -1517,6 +1517,15 @@ void LLCallDialog::draw()
}
}
// virtual
void LLCallDialog::onOpen(const LLSD& key)
{
LLDockableFloater::onOpen(key);
// it should be over the all floaters. EXT-5116
gFloaterView->bringToFront(this);
}
void LLCallDialog::setIcon(const LLSD& session_id, const LLSD& participant_id)
{
// *NOTE: 12/28/2009: check avaline calls: LLVoiceClient::isParticipantAvatar returns false for them

1
indra/newview/llimview.h
View File

@ -472,6 +472,7 @@ public:
// check timer state
/*virtual*/ void draw();
/*virtual*/ void onOpen(const LLSD& key);
protected:
// lifetime timer for a notification

10
indra/newview/skins/default/xui/en/menu_viewer.xml
View File

@ -1594,6 +1594,16 @@
name="Shortcuts"
tear_off="true"
visible="false">
<menu_item_call
label="Image (L$[COST])..."
layout="topleft"
name="Upload Image"
shortcut="control|U">
<menu_item_call.on_click
function="File.UploadImage"
parameter="" />
<menu_item_call.on_enable
function="File.EnableUpload" />
<menu_item_check
label="Search"
layout="topleft"