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

Merge viewer-quickgraphics

master
Ansariel 2016-03-10 08:50:20 +01:00
parent 7ac279bc1d 6fb7c6b43c
commit 63c895fe62
6 changed files with 36 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.sh
View File

@ -206,6 +206,13 @@ fi
# load autobuild provided shell functions and variables
eval "$("$autobuild" source_environment)"
if [ "$arch" = "Linux" ]
then
## something about the additional_packages mechanism messes up buildscripts results.py
## since we don't care about those packages on Linux, just zero it out, yes - a HACK
export additional_packages=""
fi
# dump environment variables for debugging
begin_section "Environment"
env|sort
@ -411,12 +418,6 @@ then
upload_item symbolfile "$build_dir/$symbolfile" binary/octet-stream
done
# Upload the actual dependencies used
if [ -r "$build_dir/packages/installed-packages.xml" ]
then
upload_item installer "$build_dir/packages/installed-packages.xml" text/xml
fi
# Upload the llphysicsextensions_tpv package, if one was produced
# *TODO: Make this an upload-extension
if [ -r "$build_dir/llphysicsextensions_package" ]

26
indra/llrender/llshadermgr.cpp
View File

@ -521,29 +521,13 @@ void LLShaderMgr::dumpObjectLog(GLhandleARB ret, BOOL warns, const std::string&
if (log.length() > 0 || warns)
{
LL_DEBUGS("ShaderLoading") << "Shader loading ";
if (!filename.empty())
{
if (warns)
{
LL_WARNS("ShaderLoading") << "From " << filename << ":" << LL_ENDL;
}
else
{
LL_INFOS("ShaderLoading") << "From " << filename << ":" << LL_ENDL;
}
}
}
if ( log.length() > 0 )
{
if (warns)
{
LL_WARNS("ShaderLoading") << log << LL_ENDL;
}
else
{
LL_INFOS("ShaderLoading") << log << LL_ENDL;
}
LL_CONT << "From " << filename << ":\n";
}
LL_CONT << log << LL_ENDL;
}
}

44
indra/newview/llagent.cpp
View File

@ -67,6 +67,7 @@
#include "llpaneltopinfobar.h"
#include "llparcel.h"
#include "llrendersphere.h"
#include "llscriptruntimeperms.h"
#include "llsdmessage.h"
#include "llsdutil.h"
#include "llsky.h"
@ -4940,48 +4941,7 @@ void LLAgent::stopCurrentAnimations(bool force_keep_script_perms /*= false*/)
// </FS:Ansariel>
gSavedSettings.getBOOL("RevokePermsOnStopAnimation"))
{
typedef enum e_lscript_runtime_permissions
{
SCRIPT_PERMISSION_DEBIT,
SCRIPT_PERMISSION_TAKE_CONTROLS,
SCRIPT_PERMISSION_REMAP_CONTROLS,
SCRIPT_PERMISSION_TRIGGER_ANIMATION,
SCRIPT_PERMISSION_ATTACH,
SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
SCRIPT_PERMISSION_CHANGE_LINKS,
SCRIPT_PERMISSION_CHANGE_JOINTS,
SCRIPT_PERMISSION_CHANGE_PERMISSIONS,
SCRIPT_PERMISSION_TRACK_CAMERA,
SCRIPT_PERMISSION_CONTROL_CAMERA,
SCRIPT_PERMISSION_TELEPORT,
SCRIPT_PERMISSION_EXPERIENCE,
SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT,
SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS,
SCRIPT_PERMISSION_RETURN_OBJECTS,
SCRIPT_PERMISSION_EOF
} LSCRIPTRunTimePermissions;
const U32 LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_EOF] =
{
(0x1 << 1), // SCRIPT_PERMISSION_DEBIT,
(0x1 << 2), // SCRIPT_PERMISSION_TAKE_CONTROLS,
(0x1 << 3), // SCRIPT_PERMISSION_REMAP_CONTROLS,
(0x1 << 4), // SCRIPT_PERMISSION_TRIGGER_ANIMATION,
(0x1 << 5), // SCRIPT_PERMISSION_ATTACH,
(0x1 << 6), // SCRIPT_PERMISSION_RELEASE_OWNERSHIP,
(0x1 << 7), // SCRIPT_PERMISSION_CHANGE_LINKS,
(0x1 << 8), // SCRIPT_PERMISSION_CHANGE_JOINTS,
(0x1 << 9), // SCRIPT_PERMISSION_CHANGE_PERMISSIONS
(0x1 << 10),// SCRIPT_PERMISSION_TRACK_CAMERA
(0x1 << 11),// SCRIPT_PERMISSION_CONTROL_CAMERA
(0x1 << 12),// SCRIPT_PERMISSION_TELEPORT
(0x1 << 13),// SCRIPT_PERMISSION_EXPERIENCE
(0x1 << 14),// SCRIPT_PERMISSION_SILENT_ESTATE_MANAGEMENT
(0x1 << 15),// SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS
(0x1 << 16),// SCRIPT_PERMISSION_RETURN_OBJECTS
};
U32 permissions = LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_TRIGGER_ANIMATION] | LSCRIPTRunTimePermissionBits[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS];
U32 permissions = SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_TRIGGER_ANIMATION].permbit | SCRIPT_PERMISSIONS[SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS].permbit;
sendRevokePermissions(mRegionp->getRegionID(), permissions);
if (gAgentAvatarp->isSitting())
{ // Also stand up, since auto-granted sit animation permission has been revoked

19
indra/newview/llfloaterpreference.cpp
View File

@ -1273,6 +1273,13 @@ void LLFloaterPreference::updateShowFavoritesCheckbox(bool val)
void LLFloaterPreference::setHardwareDefaults()
{
std::string preset_graphic_active = gSavedSettings.getString("PresetGraphicActive");
if (!preset_graphic_active.empty())
{
saveGraphicsPreset(preset_graphic_active);
saveSettings(); // save here to be able to return to the previous preset by Cancel
}
LLFeatureManager::getInstance()->applyRecommendedSettings();
// reset indirects before refresh because we may have changed what they control
@ -3951,6 +3958,12 @@ void LLPanelPreferenceGraphics::onPresetsListChange()
{
resetDirtyChilds();
setPresetText();
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if (instance && !gSavedSettings.getString("PresetGraphicActive").empty())
{
instance->saveSettings(); //make cancel work correctly after changing the preset
}
}
void LLPanelPreferenceGraphics::setPresetText()
@ -3965,13 +3978,17 @@ void LLPanelPreferenceGraphics::setPresetText()
std::string preset_graphic_active = presetGraphicActive();
// </FS:Ansariel>
if (hasDirtyChilds() && !preset_graphic_active.empty())
if (!preset_graphic_active.empty() && preset_graphic_active != preset_text->getText())
{
LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");
if (instance)
{
instance->saveGraphicsPreset(preset_graphic_active);
}
}
if (hasDirtyChilds() && !preset_graphic_active.empty())
{
gSavedSettings.setString("PresetGraphicActive", "");
preset_graphic_active.clear();
// This doesn't seem to cause an infinite recursion. This trigger is needed to cause the pulldown

3
indra/newview/llfloaterpreference.h
View File

@ -161,12 +161,11 @@ protected:
void loadFontPresetsFromDir(const std::string& dir, LLComboBox* font_selection_combo);
//</FS:Kadah>
public:
// This function squirrels away the current values of the controls so that
// cancel() can restore them.
void saveSettings();
public:
void setCacheLocation(const LLStringExplicit& location);
// <FS:Ansariel> Sound cache
void setSoundCacheLocation(const LLStringExplicit& location);

4
indra/newview/llscriptruntimeperms.h
View File

@ -27,7 +27,7 @@
#ifndef LL_LLSCRIPTRUNTIME_PERMS_H
#define LL_LLSCRIPTRUNTIME_PERMS_H
#include <boost/array.hpp> // <FS:Ansariel> Build fix
#include <boost/array.hpp>
typedef struct _script_perm {
std::string question;
@ -39,6 +39,8 @@ typedef struct _script_perm {
const U32 NUM_SCRIPT_PERMISSIONS = 16;
const S32 SCRIPT_PERMISSION_DEBIT = 0;
const S32 SCRIPT_PERMISSION_TRIGGER_ANIMATION = 3;
const S32 SCRIPT_PERMISSION_OVERRIDE_ANIMATIONS = 14;
// <FS:Ansariel> Also required indexes
const S32 SCRIPT_PERMISSION_TAKE_CONTROLS = 1;
const S32 SCRIPT_PERMISSION_ATTACH = 4;