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

Merge #6 with lgpl.

meow-7.2.2
Nicky 2017-02-06 12:20:13 +01:00
parent c3791746d2 0794e29328
commit 8ee25d1139
12 changed files with 85 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
indra/newview/llagent.cpp
View File

@ -3784,7 +3784,7 @@ void LLAgent::initOriginGlobal(const LLVector3d &origin_global)
}
BOOL LLAgent::leftButtonGrabbed() const
{
{
const BOOL camera_mouse_look = gAgentCamera.cameraMouselook();
return (!camera_mouse_look && mControlsTakenCount[CONTROL_LBUTTON_DOWN_INDEX] > 0)
|| (camera_mouse_look && mControlsTakenCount[CONTROL_ML_LBUTTON_DOWN_INDEX] > 0)
@ -3792,13 +3792,6 @@ BOOL LLAgent::leftButtonGrabbed() const
|| (camera_mouse_look && mControlsTakenPassedOnCount[CONTROL_ML_LBUTTON_DOWN_INDEX] > 0);
}
BOOL LLAgent::leftButtonBlocked() const
{
const BOOL camera_mouse_look = gAgentCamera.cameraMouselook();
return (!camera_mouse_look && mControlsTakenCount[CONTROL_LBUTTON_DOWN_INDEX] > 0)
|| (camera_mouse_look && mControlsTakenCount[CONTROL_ML_LBUTTON_DOWN_INDEX] > 0);
}
BOOL LLAgent::rotateGrabbed() const
{
return (mControlsTakenCount[CONTROL_YAW_POS_INDEX] > 0)
@ -4349,17 +4342,7 @@ BOOL LLAgent::anyControlGrabbed() const
BOOL LLAgent::isControlGrabbed(S32 control_index) const
{
// <FS:Ansariel> FIRE-19357: Re-revert MAINT-4488 again to fix FPS weapons
//if (gAgent.mControlsTakenCount[control_index] > 0)
// return TRUE;
//return gAgent.mControlsTakenPassedOnCount[control_index] > 0;
return mControlsTakenCount[control_index] > 0;
// </FS:Ansariel>
}
BOOL LLAgent::isControlBlocked(S32 control_index) const
{
return mControlsTakenCount[control_index] > 0;
}
void LLAgent::forceReleaseControls()

8
indra/newview/llagent.h
View File

@ -527,8 +527,7 @@ private:
// Grab
//--------------------------------------------------------------------
public:
BOOL leftButtonGrabbed() const;
BOOL leftButtonBlocked() const;
BOOL leftButtonGrabbed() const;
BOOL rotateGrabbed() const;
BOOL forwardGrabbed() const;
BOOL backwardGrabbed() const;
@ -545,9 +544,8 @@ public:
BOOL controlFlagsDirty() const;
void enableControlFlagReset();
void resetControlFlags();
BOOL anyControlGrabbed() const; // True if a script has taken over any control
BOOL isControlGrabbed(S32 control_index) const; // True if a script has taken over a control
BOOL isControlBlocked(S32 control_index) const; // Control should be ignored or won't be passed
BOOL anyControlGrabbed() const; // True iff a script has taken over a control
BOOL isControlGrabbed(S32 control_index) const;
// Send message to simulator to force grabbed controls to be
// released, in case of a poorly written script.
void forceReleaseControls();

26
indra/newview/llappearancemgr.cpp
View File

@ -3828,9 +3828,21 @@ LLSD LLAppearanceMgr::dumpCOF() const
return result;
}
// static
void LLAppearanceMgr::onIdle(void *)
{
LLAppearanceMgr* mgr = LLAppearanceMgr::getInstance();
if (mgr->mRerequestAppearanceBake)
{
mgr->requestServerAppearanceUpdate();
}
}
void LLAppearanceMgr::requestServerAppearanceUpdate()
{
if (!mOutstandingAppearanceBakeRequest)
// Workaround: we shouldn't request update from server prior to uploading all attachments, but it is
// complicated to check for pending attachment uploads, so we are just waiting for uploads to complete
if (!mOutstandingAppearanceBakeRequest && gAssetStorage->getNumPendingUploads() == 0)
{
mRerequestAppearanceBake = false;
LLCoprocedureManager::CoProcedure_t proc = boost::bind(&LLAppearanceMgr::serverAppearanceUpdateCoro, this, _1);
@ -3838,13 +3850,14 @@ void LLAppearanceMgr::requestServerAppearanceUpdate()
}
else
{
// Shedule update
mRerequestAppearanceBake = true;
}
}
void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter)
{
mRerequestAppearanceBake = false;
BoolSetter outstanding(mOutstandingAppearanceBakeRequest);
if (!gAgent.getRegion())
{
LL_WARNS("Avatar") << "Region not set, cannot request server appearance update" << LL_ENDL;
@ -3876,8 +3889,6 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAd
bool bRetry;
do
{
BoolSetter outstanding(mOutstandingAppearanceBakeRequest);
// If we have already received an update for this or higher cof version,
// put a warning in the log and cancel the request.
S32 cofVersion = getCOFVersion();
@ -3989,12 +4000,6 @@ void LLAppearanceMgr::serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAd
}
} while (bRetry);
if (mRerequestAppearanceBake)
{ // A bake request came in while this one was still outstanding.
// Requeue ourself for a later request.
requestServerAppearanceUpdate();
}
}
// [SL:KB] - Patch: Appearance-Misc
@ -4522,6 +4527,7 @@ LLAppearanceMgr::LLAppearanceMgr():
"OutfitOperationsTimeout")));
gIdleCallbacks.addFunction(&LLAttachmentsMgr::onIdle, NULL);
gIdleCallbacks.addFunction(&LLAppearanceMgr::onIdle, NULL); //sheduling appearance update requests
}
LLAppearanceMgr::~LLAppearanceMgr()

2
indra/newview/llappearancemgr.h
View File

@ -243,6 +243,7 @@ public:
bool isInUpdateAppearanceFromCOF() { return mIsInUpdateAppearanceFromCOF; }
static void onIdle(void *);
void requestServerAppearanceUpdate();
void setAppearanceServiceURL(const std::string& url) { mAppearanceServiceURL = url; }
@ -256,7 +257,6 @@ public:
void syncCofVersionAndRefresh();
// [/SL:KB]
private:
void serverAppearanceUpdateCoro(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &httpAdapter);

23
indra/newview/lltool.cpp
View File

@ -38,7 +38,6 @@
#include "lltoolfocus.h"
#include "llfocusmgr.h"
#include "llagent.h"
#include "llagentcamera.h"
#include "llviewerjoystick.h"
extern BOOL gDebugClicks;
@ -85,17 +84,7 @@ BOOL LLTool::handleMouseDown(S32 x, S32 y, MASK mask)
}
// by default, didn't handle it
// LL_INFOS() << "LLTool::handleMouseDown" << LL_ENDL;
// <FS:Ansariel> FIRE-19357: Re-revert MAINT-4488 again to fix FPS weapons
//if (gAgentCamera.cameraMouselook())
//{
// gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);
//}
//else
//{
// gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_DOWN);
//}
gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_DOWN);
// </FS:Ansariel>
return TRUE;
}
@ -106,18 +95,8 @@ BOOL LLTool::handleMouseUp(S32 x, S32 y, MASK mask)
LL_INFOS() << "LLTool left mouse up" << LL_ENDL;
}
// by default, didn't handle it
// LL_INFOS() << "LLTool::handleMouseUp" << LL_ENDL;
// <FS:Ansariel> FIRE-19357: Re-revert MAINT-4488 again to fix FPS weapons
//if (gAgentCamera.cameraMouselook())
//{
// gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_UP);
//}
//else
//{
// gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_UP);
//}
// LL_INFOS() << "LLTool::handleMouseUp" << LL_ENDL;
gAgent.setControlFlags(AGENT_CONTROL_LBUTTON_UP);
// </FS:Ansariel>
return TRUE;
}

20
indra/newview/lltoolcomp.cpp
View File

@ -760,20 +760,12 @@ BOOL LLToolCompGun::handleHover(S32 x, S32 y, MASK mask)
BOOL LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask)
{
// if the left button is blocked, don't put up the pie menu
// <FS:Ansariel> FIRE-19357: Re-revert MAINT-4488 again to fix FPS weapons
//if (gAgent.leftButtonBlocked())
//{
// // in case of "grabbed" control flag will be set later
// gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);
// return FALSE;
//}
// if the left button is grabbed, don't put up the pie menu
if (gAgent.leftButtonGrabbed())
{
gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);
return FALSE;
}
// </FS:Ansariel>
// On mousedown, start grabbing
gGrabTransientTool = this;
@ -785,20 +777,12 @@ BOOL LLToolCompGun::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLToolCompGun::handleDoubleClick(S32 x, S32 y, MASK mask)
{
// if the left button is blocked, don't put up the pie menu
// <FS:Ansariel> FIRE-19357: Re-revert MAINT-4488 again to fix FPS weapons
//if (gAgent.leftButtonBlocked())
//{
// // in case of "grabbed" control flag will be set later
// gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);
// return FALSE;
//}
// if the left button is grabbed, don't put up the pie menu
if (gAgent.leftButtonGrabbed())
{
gAgent.setControlFlags(AGENT_CONTROL_ML_LBUTTON_DOWN);
return FALSE;
}
// </FS:Ansariel>
// On mousedown, start grabbing
gGrabTransientTool = this;

3
indra/newview/lltoolgrab.cpp
View File

@ -146,10 +146,7 @@ BOOL LLToolGrabBase::handleMouseDown(S32 x, S32 y, MASK mask)
// call the base class to propogate info to sim
LLTool::handleMouseDown(x, y, mask);
// <FS:Ansariel> FIRE-19357: Re-revert MAINT-4488 again to fix FPS weapons
//if (!gAgent.leftButtonBlocked())
if (!gAgent.leftButtonGrabbed())
// </FS:Ansariel>
{
// can grab transparent objects (how touch event propagates, scripters rely on this)
gViewerWindow->pickAsync(x, y, mask, pickCallback, /*BOOL pick_transparent*/ TRUE);

6
indra/newview/llviewermedia.cpp
View File

@ -1951,7 +1951,9 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
}
else if(LLFile::stat(plugin_name, &s))
{
#if !LL_LINUX
LL_WARNS_ONCE("Media") << "Couldn't find plugin at " << plugin_name << LL_ENDL;
#endif
}
else
{
@ -1993,8 +1995,10 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
}
}
}
#if !LL_LINUX
LL_WARNS_ONCE("Plugin") << "plugin initialization failed for mime type: " << media_type << LL_ENDL;
#endif
if(gAgent.isInitialized())
{
if (std::find(sMimeTypesFailed.begin(), sMimeTypesFailed.end(), media_type) == sMimeTypesFailed.end())

2
indra/newview/llviewermenufile.cpp
View File

@ -713,7 +713,7 @@ class LLFileUploadBulk : public view_listener_t
// LL_INFOS() << "Couldn't import objects from file" << LL_ENDL;
//}
// </FS:Ansariel>
(new LLGenericLoadMultipleFilePicker(LLFilePicker::FFLOAD_ALL, boost::bind(&upload_bulk_callback, _1)))->getFiles();
LLGenericLoadMultipleFilePicker::open(LLFilePicker::FFLOAD_ALL, boost::bind(&upload_bulk_callback, _1));
return true;
}
};

5
indra/newview/llviewerwindow.cpp
View File

@ -1862,7 +1862,10 @@ LLViewerWindow::LLViewerWindow(const Params& p)
}
// <FS:Ansariel> FIRE-20416: Option for automatic UI scaling
//if (p.first_run || gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor)
if (p.first_run || (gSavedSettings.getBOOL("FSEnableAutomaticUIScaling") && gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor))
#if !LL_WINDOWS
gSavedSettings.setBOOL("FSEnableAutomaticUIScaling", FALSE); // Always disable on non-Windows systems for now
#endif
if (gSavedSettings.getBOOL("FSEnableAutomaticUIScaling") && (p.first_run || gSavedSettings.getF32("LastSystemUIScaleFactor") != system_scale_factor))
// </FS:Ansariel>
{
mSystemUIScaleFactorChanged = !p.first_run;

2
indra/newview/skins/default/xui/tr/strings.xml
View File

@ -65,7 +65,7 @@ Grafik Kartı: [GRAPHICS_CARD]
Windows Grafik Sürücüsü Sürümü: [GRAPHICS_DRIVER_VERSION]
</string>
<string name="AboutOGL">
OpenGL Sürümü: [OPENGL_VERSION]
OpenGL Sürümü [OPENGL_VERSION]
</string>
<string name="AboutLibs">
libcurl Sürümü: [LIBCURL_VERSION]

50
indra/newview/skins/starlightcui/xui/en/panel_stand_stop_flying.xml Normal file
View File

@ -0,0 +1,50 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Width and height of this panel is adapted in code to fit the parent panel -->
<panel
follows="all"
height="21"
layout="topright"
name="panel_stand_stop_flying"
mouse_opaque="false"
visible="true"
width="158">
<button
follows="left|bottom"
height="19"
image_unselected="PushButton_Selected"
label="Stand"
layout="topleft"
left="1"
name="stand_btn"
tool_tip="Click here to stand up."
top="2"
visible="false"
width="77" />
<button
follows="left|bottom"
height="19"
image_unselected="PushButton_Selected"
label="Stop Flying"
layout="topleft"
left_delta="0"
name="stop_fly_btn"
tool_tip="Stop flying"
top="2"
visible="false"
width="77" />
<button
follows="right|bottom"
height="19"
image_unselected="PushButton_Selected"
label="Flycam"
layout="topleft"
right="-5"
name="flycam_btn"
tool_tip="Stop Flycam Mode"
top="2"
visible="false"
width="77">
<commit_callback
function="View.JoystickFlycam" />
</button>
</panel>