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

Some code cleanup and adding of FS code tags

master
Ansariel 2013-07-08 13:41:13 +02:00
parent b4f22bd993
commit 3020a19cbd
11 changed files with 89 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
indra/newview/llagent.cpp
View File

@ -245,8 +245,10 @@ private:
const F32 LLAgent::MIN_AFK_TIME = 10.0f;
const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
BOOL LLAgent::ignorePrejump = 0;
BOOL LLAgent::PhoenixForceFly;
// <FS> Ignore prejump and always fly
BOOL LLAgent::ignorePrejump = FALSE;
BOOL LLAgent::fsAlwaysFly;
// </FS> Ignore prejump and always fly
std::map<std::string, std::string> LLAgent::sTeleportErrorMessages;
std::map<std::string, std::string> LLAgent::sTeleportProgressMessages;
@ -461,24 +463,26 @@ LLAgent::LLAgent() :
mMoveTimer.stop();
}
// <FS> Ignore prejump and always fly
void LLAgent::updateIgnorePrejump(const LLSD &data)
{
ignorePrejump = data.asBoolean();
}
void LLAgent::updatePhoenixForceFly(const LLSD &data)
void LLAgent::updateFSAlwaysFly(const LLSD &data)
{
PhoenixForceFly = data.asBoolean();
if (PhoenixForceFly == TRUE)
fsAlwaysFly = data.asBoolean();
if (fsAlwaysFly)
{
llinfos << "Enabling Fly Override" << llendl;
if (gSavedSettings.getBOOL("FirstUseFlyOverride") == TRUE)
{
LLNotificationsUtil::add("FirstUseFlyOverride");
if (gSavedSettings.getBOOL("FirstUseFlyOverride"))
{
LLNotificationsUtil::add("FirstUseFlyOverride");
gSavedSettings.setBOOL("FirstUseFlyOverride", FALSE);
}
}
}
// </FS> Ignore prejump and always fly
// Requires gSavedSettings to be initialized.
//-----------------------------------------------------------------------------
@ -504,8 +508,8 @@ void LLAgent::init()
mIsDoSendMaturityPreferenceToServer = true;
ignorePrejump = gSavedSettings.getBOOL("FSIgnoreFinishAnimation");
gSavedSettings.getControl("FSIgnoreFinishAnimation")->getSignal()->connect(boost::bind(&LLAgent::updateIgnorePrejump, this, _2));
PhoenixForceFly = gSavedSettings.getBOOL("FSAlwaysFly");
gSavedSettings.getControl("FSAlwaysFly")->getSignal()->connect(boost::bind(&LLAgent::updatePhoenixForceFly, this, _2));
fsAlwaysFly = gSavedSettings.getBOOL("FSAlwaysFly");
gSavedSettings.getControl("FSAlwaysFly")->getSignal()->connect(boost::bind(&LLAgent::updateFSAlwaysFly, this, _2));
selectAutorespond(gSavedPerAccountSettings.getBOOL("FSAutorespondMode"));
selectAutorespondNonFriends(gSavedPerAccountSettings.getBOOL("FSAutorespondNonFriendsMode"));
@ -786,8 +790,13 @@ BOOL LLAgent::canFly()
if (gRlvHandler.hasBehaviour(RLV_BHVR_FLY)) return FALSE;
// [/RLVa:KB]
if (isGodlike()) return TRUE;
//LGG always fly code
if(PhoenixForceFly) return TRUE;
// <FS> Always fly
if (fsAlwaysFly)
{
return TRUE;
}
// </FS>
LLViewerRegion* regionp = getRegion();
if (regionp && regionp->getBlockFly()) return FALSE;
@ -2271,11 +2280,6 @@ void LLAgent::endAnimationUpdateUI()
gMenuBarView->setVisible(TRUE);
// <FS:Ansariel> Separate navigation and favorites panel
//LLNavigationBar::getInstance()->setVisible(TRUE && gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
// <FS:Zi> Is done inside XUI now, using visibility_control
// LLNavigationBar::getInstance()->showNavigationPanel(TRUE && gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
// LLNavigationBar::getInstance()->showFavoritesPanel(TRUE && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
// </FS:Zi>
// </FS:Ansariel> Separate navigation and favorites panel
gStatusBar->setVisibleForMouselook(true);
if (gSavedSettings.getBOOL("ShowMiniLocationPanel"))
@ -2406,11 +2410,6 @@ void LLAgent::endAnimationUpdateUI()
gMenuBarView->setVisible(FALSE);
// <FS:Ansariel> Separate navigation and favorites panel
//LLNavigationBar::getInstance()->setVisible(FALSE);
// <FS:Zi> Is done inside XUI now, using visibility_control
// LLNavigationBar::getInstance()->showNavigationPanel(FALSE);
// LLNavigationBar::getInstance()->showFavoritesPanel(FALSE);
// </FS:Zi>
// </FS:Ansariel> Separate navigation and favorites panel
gStatusBar->setVisibleForMouselook(false);
LLPanelTopInfoBar::getInstance()->setVisible(FALSE);
@ -3105,6 +3104,7 @@ void LLAgent::sendMaturityPreferenceToServer(U8 pPreferredMaturity)
}
}
}
BOOL LLAgent::getAdminOverride() const
{
return mAgentAccess->getAdminOverride();
@ -3604,7 +3604,7 @@ void LLAgent::processAgentDropGroup(LLMessageSystem *msg, void **)
LLGroupMgr::getInstance()->clearGroupData(group_id);
// close the floater for this group, if any.
// AO: Don't assume that because we drop a group, we want floaters to change.
// <FS:AO> Don't assume that because we drop a group, we want floaters to change.
//LLGroupActions::closeGroup(group_id);
}
else
@ -3708,7 +3708,7 @@ LLHTTPRegistration<LLAgentDropGroupViewerNode>
// static
void LLAgent::processAgentGroupDataUpdate(LLMessageSystem *msg, void **)
{
{
LLUUID agent_id;
msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
@ -3764,7 +3764,7 @@ class LLAgentGroupDataUpdateViewerNode : public LLHTTPNode
if(body.has("body"))
body = body["body"];
LLUUID agent_id = body["AgentData"][0]["AgentID"].asUUID();
if (agent_id != gAgentID)
{
llwarns << "processAgentGroupDataUpdate for agent other than me" << llendl;
@ -3807,7 +3807,7 @@ class LLAgentGroupDataUpdateViewerNode : public LLHTTPNode
gAgent.mGroups.put(group);
}
if (need_floater_update)
{
{
update_group_floaters(group.mID);
}
}
@ -3847,6 +3847,7 @@ void LLAgent::processAgentDataUpdate(LLMessageSystem *msg, void **)
gAgent.mGroupPowers = 0;
gAgent.mGroupName.clear();
}
// <FS> Restore to world
if (gAgent.restoreToWorld)
{
//This fires if we're trying to restore an item to world using the correct group.
@ -3887,6 +3888,8 @@ void LLAgent::processAgentDataUpdate(LLMessageSystem *msg, void **)
msg->addUUIDFast(_PREHASH_GroupID, gAgent.restoreToWorldGroup);
gAgent.sendReliableMessage();
}
// </FS>
update_group_floaters(active_id);
// <FS:Ansariel> Fire event for group title overview
@ -4159,7 +4162,7 @@ void LLAgent::clearVisualParams(void *data)
//---------------------------------------------------------------------------
// Teleport
//---------------------------------------------------------------------------
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
bool LLAgent::teleportBridgeLocal(LLVector3& pos_local)
{
std::stringstream msgstream;
@ -4175,9 +4178,8 @@ bool LLAgent::teleportBridgeGlobal(const LLVector3d& pos_global)
LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle));
return teleportBridgeLocal(pos_local);
}
//-TT Client LSL Bridge
// </FS:TT> Client LSL Bridge
// teleportCore() - stuff to do on any teleport
// protected
@ -4221,7 +4223,7 @@ bool LLAgent::teleportCore(bool is_local)
// hide the Region/Estate floater
LLFloaterReg::hideInstance("region_info");
// hide the Search floater (TS: FIRE-2886, backing out STORM-1474)
// minimize the Search floater (STORM-1474)
{
LLFloater* instance = LLFloaterReg::getInstance("search");
@ -4269,7 +4271,7 @@ bool LLAgent::teleportCore(bool is_local)
// bit of a hack -KC
KCWindlightInterface::instance().setTPing(true);
}
make_ui_sound("UISndTeleportOut"); //AO
make_ui_sound("UISndTeleportOut");
// MBW -- Let the voice client know a teleport has begun so it can leave the existing channel.
// This was breaking the case of teleporting within a single sim. Backing it out for now.
@ -4568,12 +4570,12 @@ void LLAgent::doTeleportViaLocation(const LLVector3d& pos_global)
msg->addVector3Fast(_PREHASH_LookAt, pos);
sendReliableMessage();
}
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
if (gSavedSettings.getBOOL("UseLSLBridge") && isLocal)
{
teleportBridgeGlobal(pos_global);
}
//-TT
// </FS:TT>
}
// Teleport to global position, but keep facing in the same direction
@ -4600,19 +4602,23 @@ void LLAgent::doTeleportViaLocationLookAt(const LLVector3d& pos_global)
U64 region_handle = to_region_handle(pos_global);
// <FS:CR> Aurora-sim var region teleports
LLSimInfo* simInfo = LLWorldMap::instance().simInfoFromHandle(region_handle);
if(simInfo)
if (simInfo)
{
region_handle = simInfo->getHandle();
}
// </FS:CR>
LLVector3 pos_local = (LLVector3)(pos_global - from_region_handle(region_handle));
teleportRequest(region_handle, pos_local, getTeleportKeepsLookAt());
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
if (gSavedSettings.getBOOL("UseLSLBridge"))
{
if (region_handle == to_region_handle(getPositionGlobal()))
{
teleportBridgeLocal(pos_local);
}
}
//-TT
// </FS:TT>
}
void LLAgent::setTeleportState(ETeleportState state)
@ -5106,21 +5112,25 @@ void LLAgent::renderAutoPilotTarget()
}
}
// Firestorm Phantom
// <FS> Phantom mode
void LLAgent::togglePhantom()
{
mPhantom = !mPhantom;
if(mPhantom)
if (mPhantom)
{
LLNotificationsUtil::add("PhantomOn", LLSD());
}
else
{
LLNotificationsUtil::add("PhantomOff", LLSD());
}
}
bool LLAgent::getPhantom() const
{
return mPhantom;
}
// Firestorm Phantom
// </FS> Phantom mode
/********************************************************************************/

13
indra/newview/llagent.h
View File

@ -461,10 +461,13 @@ private:
U32 mControlFlags; // Replacement for the mFooKey's
BOOL mbFlagsDirty;
BOOL mbFlagsNeedReset; // ! HACK ! For preventing incorrect flags sent when crossing region boundaries
// <FS> Ignore prejump and always fly
static BOOL ignorePrejump;
static BOOL PhoenixForceFly;
static BOOL fsAlwaysFly;
void updateIgnorePrejump(const LLSD &data);
void updatePhoenixForceFly(const LLSD &data);
void updateFSAlwaysFly(const LLSD &data);
// </FS> Ignore prejump and always fly
//--------------------------------------------------------------------
// Animations
@ -613,10 +616,10 @@ public:
void teleportViaLocationLookAt(const LLVector3d& pos_global);// To a global location, preserving camera rotation
void teleportCancel(); // May or may not be allowed by server
bool getTeleportKeepsLookAt() { return mbTeleportKeepsLookAt; } // Whether look-at reset after teleport
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
bool teleportBridgeLocal(LLVector3& pos_local); // Teleport using LSL Bridge
bool teleportBridgeGlobal(const LLVector3d& pos_global); // Teleport using LSL Bridge
//-TT
bool teleportBridgeGlobal(const LLVector3d& pos_global); // Teleport using LSL Bridge
// </FS:TT>
protected:
bool teleportCore(bool is_local = false); // Stuff for all teleports; returns true if the teleport can proceed

3
indra/newview/llagentcamera.cpp
View File

@ -2898,8 +2898,6 @@ S32 LLAgentCamera::directionToKey(S32 direction)
}
// <FS:Ansariel> FIRE-7758: Save/load camera position feature
// Copyright (C) 2012, Ansariel Hiller @ Second Life for Phoenix Firestorm Viewer
// This code is licensed unter the GNU Lesser General Public License version 2.1
void LLAgentCamera::storeCameraPosition()
{
mStoredCameraPos = getCameraPositionGlobal();
@ -2935,4 +2933,3 @@ void LLAgentCamera::loadCameraPosition()
// </FS:Ansariel> FIRE-7758: Save/load camera position feature
// EOF

2
indra/newview/llagentcamera.h
View File

@ -393,8 +393,6 @@ private:
*******************************************************************************/
// <FS:Ansariel> FIRE-7758: Save/load camera position feature
// Copyright (C) 2012, Ansariel Hiller @ Second Life for Phoenix Firestorm Viewer
// This code is licensed unter the GNU Lesser General Public License version 2.1
public:
void storeCameraPosition();
void loadCameraPosition();

2
indra/newview/llagentlanguage.cpp
View File

@ -47,7 +47,7 @@ void LLAgentLanguage::onChange()
{
// Clear inventory cache so that default names of inventory items
// appear retranslated (EXT-8308).
// AO: Purging the cache every language change is less desirable than having to manually cache clear once to retranslate inventory.
// <FS:AO> Purging the cache every language change is less desirable than having to manually cache clear once to retranslate inventory.
//gSavedSettings.setBOOL("PurgeCacheOnNextStartup", TRUE);
}

4
indra/newview/llagentui.cpp
View File

@ -172,6 +172,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.empty() ? "" : " - ",
sim_access_string.c_str());
break;
// <FS:Ansariel> V1 format statusbar
case LOCATION_FORMAT_V1_STATUSBAR:
if (fsStatusbarShowSimulatorVersion && !simulator_channel.empty())
{
@ -191,6 +192,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.c_str());
}
break;
// </FS:Ansariel> V1 format statusbar
}
}
else
@ -225,6 +227,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.empty() ? "" : " - ",
sim_access_string.c_str());
break;
// <FS:Ansariel> V1 format statusbar
case LOCATION_FORMAT_V1_STATUSBAR:
if (fsStatusbarShowSimulatorVersion && !simulator_channel.empty())
{
@ -246,6 +249,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
parcel_name.c_str());
}
break;
// </FS:Ansariel> V1 format statusbar
}
}
str = buffer;

2
indra/newview/llagentui.h
View File

@ -39,7 +39,7 @@ public:
LOCATION_FORMAT_NO_MATURITY, // Parcel, Region (x, y, z)
LOCATION_FORMAT_NO_COORDS, // Parcel, Region - Maturity
LOCATION_FORMAT_FULL, // Parcel, Region (x, y, z) - Maturity
LOCATION_FORMAT_V1_STATUSBAR, // Ansariel: V1 mode for status bar: Region (x, y, z) - Maturity - Parcel
LOCATION_FORMAT_V1_STATUSBAR, // <FS:Ansariel> V1 mode for status bar: Region (x, y, z) - Maturity - Parcel
};
static void buildFullname(std::string &name);

24
indra/newview/llappearancemgr.cpp
View File

@ -1492,7 +1492,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
gInventory.collectDescendentsIf(cat_id, cats, items, FALSE, collector);
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
if (gSavedSettings.getBOOL("UseLSLBridge"))
{
//if replacing - make sure bridge stays.
@ -1501,10 +1501,9 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
llinfos << "reinserting bridge at outfit remove" << llendl;
//items.find(FSLSLBridge::instance().getBridge());
items.removeObj(FSLSLBridge::instance().getBridge());
llinfos << "reinserted bridge at outfit remove" << llendl;
}
}
//-TT
// </FS:TT>
LLInventoryModel::item_array_t::const_iterator it = items.begin();
const LLInventoryModel::item_array_t::const_iterator it_end = items.end();
@ -2578,12 +2577,12 @@ void LLAppearanceMgr::getUserDescendents(const LLUUID& category,
}
void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append)
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
{
wearInventoryCategory(category, copy, append, false);
}
void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool replace)
//-TT
// </FS:TT>
{
if(!category) return;
@ -2599,26 +2598,26 @@ void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool
callAfterCategoryFetch(category->getUUID(),boost::bind(&LLAppearanceMgr::wearCategoryFinal,
&LLAppearanceMgr::instance(),
category->getUUID(), copy, append));
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
//category->getUUID(), copy, append, replace));
//-TT
// <FS:TT>
}
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
void LLAppearanceMgr::replaceCategoryInCurrentOutfit(const LLUUID& cat_id)
{
LLViewerInventoryCategory* cat = gInventory.getCategory(cat_id);
wearInventoryCategory(cat, false, true);
}
//-TT
// </FS:TT>
void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append)
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
{
wearCategoryFinal(cat_id, copy_items, append, false);
}
void LLAppearanceMgr::wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool replace)
//-TT
// </FS:TT>
{
LL_INFOS("Avatar") << self_av_string() << "starting" << LL_ENDL;
@ -3109,7 +3108,7 @@ void LLAppearanceMgr::updateIsDirty()
gInventory.collectDescendentsIf(base_outfit, outfit_cats, outfit_items,
LLInventoryModel::EXCLUDE_TRASH, collector);
// FIRE-3018: Ignore the bridge when checking for dirty. -- TS
// <FS:TS> FIRE-3018: Ignore the bridge when checking for dirty.
for (U32 i = 0; i < cof_items.size(); ++i)
{
LLViewerInventoryItem *item = cof_items.get(i);
@ -3120,6 +3119,7 @@ void LLAppearanceMgr::updateIsDirty()
break;
}
}
// </FS:TS>
if(outfit_items.count() != cof_items.count())
{

10
indra/newview/llappearancemgr.h
View File

@ -61,17 +61,15 @@ public:
bool append = false, const LLUUID& idOutfit = LLUUID::null);
// [/RLVa:KB]
void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append);
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
void wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append, bool items);
//-TT
// </FS:TT>
void wearInventoryCategoryOnAvatar(LLInventoryCategory* category, bool append);
void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append);
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
void wearCategoryFinal(LLUUID& cat_id, bool copy_items, bool append, bool items);
//-TT
//-TT Patch: ReplaceWornItemsOnly
void replaceCategoryInCurrentOutfit(const LLUUID& cat_id);
//-TT
// </FS:TT>
void wearOutfitByName(const std::string& name);
void changeOutfit(bool proceed, const LLUUID& category, bool append);
void replaceCurrentOutfit(const LLUUID& new_outfit);

3
indra/newview/llappviewer.cpp
View File

@ -1114,12 +1114,15 @@ bool LLAppViewer::init()
gGLManager.printGLInfoString();
// Load Default bindings
// <FS:Ansariel> Optional AZERTY keyboard layout
//std::string key_bindings_file = gDirUtilp->findFile("keys.xml",
std::string keyBindingFileName("keys.xml");
if (gSavedSettings.getBOOL("FSUseAzertyKeyboardLayout"))
{
keyBindingFileName = "keys_azerty.xml";
}
std::string key_bindings_file = gDirUtilp->findFile(keyBindingFileName,
// </FS:Ansariel>
gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, ""),
gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));

13
indra/newview/llassetuploadresponders.cpp
View File

@ -51,9 +51,6 @@
#include "llviewertexlayer.h"
#include "llviewerwindow.h"
#include "lltrans.h"
//-TT Client LSL Bridge
#include "fslslbridge.h"
//-TT
// library includes
#include "lldir.h"
@ -66,6 +63,8 @@
#include "llsdutil.h"
#include "llvfs.h"
#include "tea.h" // <FS:AW opensim currency support>
// <FS:TT> Client LSL Bridge
#include "fslslbridge.h"
// When uploading multiple files, don't display any of them when uploading more than this number.
static const S32 FILE_COUNT_DISPLAY_THRESHOLD = 5;
@ -610,10 +609,12 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content)
preview->callbackLSLCompileFailed(content["errors"]);
}
}
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
if (gSavedSettings.getBOOL("UseLSLBridge"))
FSLSLBridge::instance().checkBridgeScriptName(mFileName);
//-TT
{
FSLSLBridge::instance().checkBridgeScriptName(mFileName);
}
// </FS:TT>
break;
}