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

Merge.

meow-7.2.2
Nicky 2015-09-08 21:21:14 +02:00
parent 8f1f663a75 02e9339da5
commit e34f0fe33c
13 changed files with 25 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
autobuild.xml
View File

@ -184,9 +184,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>459cdc8d7c19a8025f98f61db95622ff</string>
<string>76302ef4f99f34f45ccc844481b83406</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/sdl_3p-update-sdl/rev/297546/arch/Linux/installer/SDL-1.2.15-linux-297546.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/SDL-1.2.15-linux-201509032122-r43.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
@ -1976,9 +1976,9 @@
<key>archive</key>
<map>
<key>hash</key>
<string>b1245d467d5914a266efa16afeb55406</string>
<string>e0c6acdbab116792347a01994f229cd7</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/libndofdev_3p-update-libndofdev/rev/297553/arch/Linux/installer/open_libndofdev-0.3-linux-297553.tar.bz2</string>
<string>http://downloads.phoenixviewer.com/open_libndofdev-0.3-linux-201509040011-r11.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>

36
indra/newview/fsfloaterimcontainer.cpp
View File

@ -30,21 +30,15 @@
#include "llviewerprecompiledheaders.h"
#include "fsfloaterimcontainer.h"
#include "llfloaterreg.h"
#include "llimview.h"
#include "llavatariconctrl.h"
#include "llgroupiconctrl.h"
#include "llagent.h"
#include "lltransientfloatermgr.h"
#include "fsfloaternearbychat.h"
#include "fsfloatercontacts.h"
#include "llfloater.h"
#include "llviewercontrol.h"
#include "fsfloaterim.h"
#include "llvoiceclient.h"
#include "lltoolbarview.h"
#include "fsfloaternearbychat.h"
#include "llfloaterreg.h"
#include "llchiclet.h"
#include "llchicletbar.h"
#include "lltoolbarview.h"
#include "llvoiceclient.h"
static const F32 VOICE_STATUS_UPDATE_INTERVAL = 1.0f;
@ -340,8 +334,10 @@ void FSFloaterIMContainer::onNewMessageReceived(const LLSD& data)
if (floaterp && current_floater && floaterp != current_floater
&& (gSavedSettings.getBOOL("FSIMChatFlashOnFriendStatusChange") || !data.has("from_id") || data["from_id"].asUUID().notNull()))
{
if(LLMultiFloater::isFloaterFlashing(floaterp))
if (LLMultiFloater::isFloaterFlashing(floaterp))
{
LLMultiFloater::setFloaterFlashing(floaterp, FALSE);
}
LLMultiFloater::setFloaterFlashing(floaterp, TRUE);
}
}
@ -356,22 +352,6 @@ FSFloaterIMContainer* FSFloaterIMContainer::getInstance()
return LLFloaterReg::getTypedInstance<FSFloaterIMContainer>("fs_im_container");
}
void FSFloaterIMContainer::setMinimized(BOOL b)
{
if (isMinimized() == b) return;
LLMultiFloater::setMinimized(b);
// Hide minimized floater (see EXT-5315)
setVisible(!b);
if (isMinimized()) return;
if (getActiveFloater())
{
getActiveFloater()->setVisible(TRUE);
}
}
void FSFloaterIMContainer::setVisible(BOOL b)
{
LLMultiFloater::setVisible(b);

9
indra/newview/fsfloaterimcontainer.h
View File

@ -30,13 +30,7 @@
#ifndef FS_FLOATERIMCONTAINER_H
#define FS_FLOATERIMCONTAINER_H
#include <map>
#include <vector>
#include "llfloater.h"
#include "llmultifloater.h"
#include "llavatarpropertiesprocessor.h"
#include "llgroupmgr.h"
#include "llimview.h"
class LLTabContainer;
@ -64,7 +58,6 @@ public:
static FSFloaterIMContainer* findInstance();
static FSFloaterIMContainer* getInstance();
virtual void setMinimized(BOOL b);
virtual void setVisible(BOOL b);
void onNewMessageReceived(const LLSD& data); // public so nearbychat can call it directly. TODO: handle via callback. -AO
@ -98,7 +91,7 @@ private:
eVoiceState mCurrentVoiceState;
bool mForceVoiceStateUpdate;
typedef std::map<LLUUID,LLFloater*> avatarID_panel_map_t;
typedef std::map<LLUUID, LLFloater*> avatarID_panel_map_t;
avatarID_panel_map_t mSessions;
boost::signals2::connection mNewMessageConnection;

1
indra/newview/fspanelprofile.cpp
View File

@ -833,6 +833,7 @@ BOOL FSPanelProfileWeb::postBuild()
mWebBrowser = getChild<LLMediaCtrl>("profile_html");
mWebBrowser->addObserver(this);
mWebBrowser->setHomePageUrl("about:blank");
mUrlEdit->setEnabled(FALSE);

2
indra/newview/llfloaterscriptdebug.cpp
View File

@ -280,7 +280,7 @@ void LLFloaterScriptDebugOutput::addLine(const LLChat& chat, const std::string &
setTitle(user_name);
setShortTitle(user_name);
if (gSavedSettings.getBOOL("FSllOwnerSayToScriptDebugWindow") && getKey().asUUID().isNull())
if (gSavedPerAccountSettings.getBOOL("FSllOwnerSayToScriptDebugWindow") && getKey().asUUID().isNull())
{
std::string url = chat.mURL;
if ((url.empty()) || (std::string::npos == url.find("objectim")))

6
indra/newview/llfloatersnapshot.cpp
View File

@ -547,7 +547,11 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
default:
break;
}
setAspectRatioCheckboxValue(floater, !floater->impl.mAspectRatioCheckOff && gSavedSettings.getBOOL("KeepAspectForSnapshot"));
// <FS:Ansariel> FIRE-16885: Aspect ratio checkbox enabled state sometimes is wrong
//setAspectRatioCheckboxValue(floater, !floater->impl.mAspectRatioCheckOff && gSavedSettings.getBOOL("KeepAspectForSnapshot"));
setAspectRatioCheckboxValue(floater, gSavedSettings.getBOOL("KeepAspectForSnapshot"));
enableAspectRatioCheckbox(floater, !floater->impl.mAspectRatioCheckOff);
// </FS:Ansariel>
if (previewp)
{

1
indra/newview/skins/default/xui/en/floater_about_land.xml
View File

@ -2215,7 +2215,6 @@ Only large parcels can be listed in search.
top="0"
help_topic="land_experiences_tab"
name="land_experiences_panel"
class="land_experiences_panel"
filename="panel_region_experiences.xml">
</panel>
</tab_container>

13
indra/newview/skins/default/xui/en/floater_fs_im_container.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater
can_close="true"
can_minimize="false"
can_minimize="true"
can_resize="true"
height="390"
layout="topleft"
@ -34,15 +34,4 @@
<middle_tab tab_bottom_image_unselected="Toolbar_Middle_IM_Unselected"/>
<last_tab tab_bottom_image_unselected="Toolbar_Right_IM_Unselected"/>
</tab_container>
<icon
color="DefaultShadowLight"
enabled="false"
follows="left|right|bottom"
height="20"
image_name="tabarea.tga"
layout="bottomleft"
left="1"
name="im_box_tab_container_icon"
bottom="10"
width="394" />
</multi_floater>

1
indra/newview/skins/default/xui/en/panel_preferences_setup.xml
View File

@ -218,7 +218,6 @@
<radio_group
control_name="PreferredBrowserBehavior"
draw_border="false"
follows="left|top"
height="50"
layout="topleft"

1
indra/newview/skins/latency/xui/en/floater_about_land.xml
View File

@ -2163,7 +2163,6 @@ Only large parcels can be listed in search.
top="0"
help_topic="land_experiences_tab"
name="land_experiences_panel"
class="land_experiences_panel"
filename="panel_region_experiences.xml">
</panel>
</tab_container>

1
indra/newview/skins/vintage/xui/en/floater_about_land.xml
View File

@ -2163,7 +2163,6 @@ Only large parcels can be listed in search.
top="0"
help_topic="land_experiences_tab"
name="land_experiences_panel"
class="land_experiences_panel"
filename="panel_region_experiences.xml">
</panel>
</tab_container>

15
indra/newview/skins/vintage/xui/en/floater_im_container.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<multi_floater
can_close="true"
can_minimize="false"
can_minimize="true"
can_resize="true"
height="390"
layout="topleft"
@ -15,7 +15,7 @@
<tab_container
follows="left|right|top|bottom"
height="390"
label_pad_left="10"
label_pad_left="10"
layout="topleft"
left="1"
name="im_box_tab_container"
@ -29,15 +29,4 @@
use_ellipses="true"
top="0"
width="394"/>
<icon
color="DefaultShadowLight"
enabled="false"
follows="left|right|bottom"
height="20"
image_name="tabarea.tga"
layout="bottomleft"
left="1"
name="im_box_tab_container_icon"
bottom="10"
width="394" />
</multi_floater>

4
package_override_gcc.ini
View File

@ -89,10 +89,10 @@ linux = http://downloads.phoenixviewer.com/curl-7.38.0.201505150249-r147-linux-
linux = http://downloads.phoenixviewer.com/llqtwebkit-4.7.1-linux-x64-201505150251-r131.tar.bz2|de49fafd04335bf11948570b445658bb
[sdl]
linux = http://downloads.phoenixviewer.com/SDL-1.2.15-linux-x64-201505150321-r41.tar.bz2|2a489c6ee44aada700ed82e02b0e53c0
linux = http://downloads.phoenixviewer.com/SDL-1.2.15-linux-x64-201509062227-r43.tar.bz2|2566e373b89a2e4f8e93a78948deda10
[open-libndofdev]
linux = http://downloads.phoenixviewer.com/open_libndofdev-0.3-linux-x64-201505150328-r8.tar.bz2|212e700165a391268c527eb6d4675a26
linux = http://downloads.phoenixviewer.com/open_libndofdev-0.6-linux-x64-201509062233-r14.tar.bz2|240c5937f467c61e3d5ca6647c24295f
[uriparser]
linux = http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-x64-201502251606-r15.tar.bz2|e67a27e13e546cbb13fad2665a1896b7