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

Merge

master
Tank_Master 2013-07-09 16:26:07 -07:00
parent d4640277d0 7416d71731
commit 8146bbda39
54 changed files with 366 additions and 591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
indra/newview/app_settings/settings.xml
View File

@ -5943,17 +5943,6 @@
<key>Value</key>
<real>0.0</real>
</map>
<key>ForceInitialCOFDelay</key>
<map>
<key>Comment</key>
<string>Number of seconds to delay initial processing of COF contents</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<integer>0.0</integer>
</map>
<key>ForceShowGrid</key>
<map>
<key>Comment</key>
@ -5991,17 +5980,6 @@
<key>Backup</key>
<integer>0</integer>
</map>
<key>ForceMissingType</key>
<map>
<key>Comment</key>
<string>Force this wearable type to be missing from COF</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>U32</string>
<key>Value</key>
<integer>255</integer>
</map>
<key>FreezeTime</key>
<map>
<key>Comment</key>
@ -9349,17 +9327,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>PlaySoundNewConversation</key>
<map>
<key>Comment</key>
<string>Plays a sound when have a new conversation.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>PlaySoundTeleportOffer</key>
<map>
@ -15935,17 +15902,6 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Backup</key>
<integer>0</integer>
</map>
<key>VerifyInitialWearables</key>
<map>
<key>Comment</key>
<string>Compares the initial wearables to the COF contents to determine which one to use for the intial outfit</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<boolean>0</boolean>
</map>
<key>VertexShaderEnable</key>
<map>
<key>Comment</key>

12
indra/newview/app_settings/settings_hybrid.xml
View File

@ -135,18 +135,6 @@
<integer>2</integer>
</map>
<key>FSScriptDialogNoTransparency</key>
<map>
<key>Comment</key>
<string>If true, script dialogs will be shown opaque and ignore the floater opacity settings.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>ShowRadarMinimap</key>
<map>
<key>Comment</key>

12
indra/newview/app_settings/settings_latency.xml
View File

@ -35,18 +35,6 @@
<integer>0</integer>
</map>
<key>SkinCurrent</key>
<map>
<key>Comment</key>
<string>The currently selected skin.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>vintage</string>
</map>
<key>FSColorClienttags</key>
<map>
<key>Comment</key>

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

@ -624,17 +624,6 @@
<key>Value</key>
<string></string>
</map>
<key>ExodusFlickrUsername</key>
<map>
<key>Comment</key>
<string>Flickr Username</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string></string>
</map>
<key>ExodusFlickrNSID</key>
<map>
<key>Comment</key>

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);

38
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())
{
@ -3887,14 +3887,14 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove)
bool fUpdateAppearance = false;
for (uuid_vec_t::const_iterator it = ids_to_remove.begin(); it != ids_to_remove.end(); ++it)
{
const LLUUID& linked_item_id = gInventory.getLinkedItemID(*it);
if ( (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(gInventory.getItem(linked_item_id))) )
const LLInventoryItem* linked_item = gInventory.getLinkedItem(*it);
if (linked_item && (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(linked_item)) )
{
continue;
}
fUpdateAppearance = true;
const LLUUID& linked_item_id = gInventory.getLinkedItemID(*it);
removeCOFItemLinks(linked_item_id);
}
@ -3914,15 +3914,15 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove)
void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove)
{
LLUUID linked_item_id = gInventory.getLinkedItemID(id_to_remove);
// [RLVa:KB] - Checked: 2013-02-12 (RLVa-1.4.8)
if ( (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(gInventory.getItem(linked_item_id))) )
const LLInventoryItem* linked_item = gInventory.getLinkedItem(id_to_remove);
if (linked_item && (rlv_handler_t::isEnabled()) && (!rlvPredCanRemoveItem(linked_item)) )
{
return;
}
// [/RLVA:KB]
LLUUID linked_item_id = gInventory.getLinkedItemID(id_to_remove);
removeCOFItemLinks(linked_item_id);
updateAppearanceFromCOF();
}

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

@ -1136,12 +1136,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;
}

45
indra/newview/llavataractions.cpp
View File

@ -69,30 +69,27 @@
#include "llviewerobjectlist.h"
#include "llviewermessage.h" // for handle_lure
#include "llviewerregion.h"
// <FS:Ansariel> [FS communication UI]
#include "fsfloaterim.h"
#include "fsfloaterimcontainer.h"
// </FS:Ansariel> [FS communication UI]
#include "lltrans.h"
#include "llcallingcard.h"
#include "llslurl.h" // IDEVO
#include "llsidepanelinventory.h"
// [RLVa:KB] - Checked: 2011-04-11 (RLVa-1.3.0)
// Firestorm includes
#include "fsfloaterim.h"
#include "fsfloaterimcontainer.h"
#include "fsfloaterprofile.h"
#include "fslslbridge.h"
#include "fswsassetblacklist.h"
#include "llfloaterregioninfo.h"
#include "llfloaterreporter.h"
#include "llparcel.h"
#include "lltrans.h"
#include "llviewermenu.h"
#include "llviewerparcelmgr.h"
#include "llworld.h"
#include "rlvactions.h"
#include "rlvcommon.h"
#include "rlvhandler.h" // <FS:Ansariel> FIRE-8804: Prevent opening inventory from using share in radar context menu
// [/RLVa:KB]
#include "fslslbridge.h"
//<FS:KC legacy profiles>
#include "llworld.h" //Added: Catznip-2.4.0g
#include "llfloaterreporter.h" // [SL:KB] - Patch: UI-SidepanelPeople
#include "llparcel.h" //Added: Catznip-2.4.0g
#include "llviewerparcelmgr.h" //Added: Catznip-2.4.0g
#include "fsfloaterprofile.h"
#include "llfloaterregioninfo.h"
#include "lltrans.h"
#include "fswsassetblacklist.h"
#include "llviewermenu.h"
#include "rlvhandler.h"
// static
void LLAvatarActions::requestFriendshipDialog(const LLUUID& id, const std::string& name)
@ -206,9 +203,8 @@ static void on_avatar_name_cache_start_im(const LLUUID& agent_id,
if (session_id != LLUUID::null)
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMContainer::getInstance()->showConversation(session_id); <FS:TM> CHUI merge LL New
//LLIMFloater::show(session_id); <FS:TM> CHUI merge LL old
FSFloaterIM::show(session_id); //<FS:TM> FS orig
//LLFloaterIMContainer::getInstance()->showConversation(session_id);
FSFloaterIM::show(session_id);
// </FS:Ansariel> [FS communication UI]
}
make_ui_sound("UISndStartIM");
@ -361,15 +357,12 @@ void LLAvatarActions::startConference(const uuid_vec_t& ids, const LLUUID& float
if (session_id == LLUUID::null)
{
// <FS:Ansariel> [FS communication UI]
// return; <FS:TM> CHUI merge LL new
//LLIMFloater::show(session_id); <FS:TM> CHUI merge LL old
FSFloaterIM::show(session_id); //<FS:TM> CHUI merge FS orig
// </FS:Ansariel> [FS communication UI]
return;
}
// <FS:Ansariel> [FS communication UI]
//FSFloaterIMContainer::getInstance()->showConversation(session_id);
FSFloaterIM::show(session_id);
// </FS:Ansariel> [FS communication UI]
make_ui_sound("UISndStartIM");

41
indra/newview/llavatarlist.cpp
View File

@ -488,23 +488,23 @@ void LLAvatarList::refresh()
{
// *NOTE: If you change the UI to show a different string,
// be sure to change the filter code below.
// <FS:TM> CHUI merge LL old begin v
//if (LLRecentPeople::instance().isAvalineCaller(buddy_id))
//{
// const LLSD& call_data = LLRecentPeople::instance().getData(buddy_id);
// addAvalineItem(buddy_id, call_data["session_id"].asUUID(), call_data["call_number"].asString());
//}
//else
//{
// <FS:TM CHUI merge old end ^
// std::string display_name = av_name.getDisplayName(); <FS:TM> CHUI merge new
addNewItem(buddy_id,
//display_name.empty() ? waiting_str : display_name, <FS:TM> CHUI merge new
//av_name.mDisplayName.empty() ? waiting_str : av_name.mDisplayName, <FS:TM> CHUI merge old
av_name.getCompleteName(), //<FS:TM> FS orig
LLAvatarTracker::instance().isBuddyOnline(buddy_id));
if (LLRecentPeople::instance().isAvalineCaller(buddy_id))
{
const LLSD& call_data = LLRecentPeople::instance().getData(buddy_id);
addAvalineItem(buddy_id, call_data["session_id"].asUUID(), call_data["call_number"].asString());
}
else
{
// <FS:AO> Always show usernames on avatar lists
//std::string display_name = av_name.getDisplayName();
//addNewItem(buddy_id,
// display_name.empty() ? waiting_str : display_name,
// LLAvatarTracker::instance().isBuddyOnline(buddy_id));
addNewItem(buddy_id,
av_name.getCompleteName(),
LLAvatarTracker::instance().isBuddyOnline(buddy_id));
// </FS:AO>
}
modified = true;
nadded++;
}
@ -529,9 +529,10 @@ void LLAvatarList::refresh()
const LLUUID& buddy_id = it->asUUID();
LLAvatarName av_name;
have_names &= LLAvatarNameCache::get(buddy_id, &av_name);
//if (!findInsensitive(av_name.mDisplayName, mNameFilter)) <FS:TM> CHUI merge old
//if (!findInsensitive(av_name.getDisplayName(), mNameFilter)) <FS:TM> CHUI merge new
if (!findInsensitive(av_name.getCompleteName(), mNameFilter)) // <FS:TM> FS orig
// <FS:AO> Always show usernames on avatar lists
//if (!findInsensitive(av_name.getDisplayName(), mNameFilter))
if (!findInsensitive(av_name.getCompleteName(), mNameFilter))
// </FS:AO>
{
removeItemByUUID(buddy_id);
modified = true;

18
indra/newview/llcallingcard.cpp
View File

@ -63,20 +63,12 @@
#include "llavataractions.h"
#include "lggcontactsets.h"
//<FS:TM> CHUI Merge varify if any of the below are still needed
// <FS:Zi> Remove floating chat bar
// #include "llnearbychat.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaternearbychat.h"
#include "fsfloaternearbychat.h" //<FS:TM> CHUI Merge can we get rid if this? line 903
#include "fsfloaterim.h"
#include "fsfloaternearbychat.h"
// <FS:Ansariel> [FS communication UI]
// </FS:Zi>
#include "llfloaterreg.h"
#include "llnotificationmanager.h"
// <FS:Ansariel> [FS communication UI]
//#include "llimfloater.h"
#include "fsfloaterim.h"
// <FS:Ansariel>
///----------------------------------------------------------------------------
/// Local function declarations, constants, enums, and typedefs
@ -356,8 +348,8 @@ void LLAvatarTracker::setBuddyOnline(const LLUUID& id, bool is_online)
}
else
{
//<FS:LO> Fix possable log spam with a large friendslist when SL messes up.
//lldebugs << "!! No buddy info found for " << id
//<FS:LO> Fix possible log spam with a large friendslist when SL messes up.
//llwarns << "!! No buddy info found for " << id
lldebugs << "!! No buddy info found for " << id
<< ", setting to " << (is_online ? "Online" : "Offline") << llendl;
//</FS:LO>
@ -928,7 +920,6 @@ void LLAvatarTracker::formFriendship(const LLUUID& id)
// <FS:Ansariel> FIRE-3248: Disable add friend button on IM floater if friendship request accepted
LLUUID im_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, id);
// <FS:Ansariel> [FS communication UI]
//LLIMFloater* im_floater = LLIMFloater::findInstance(im_session_id);
FSFloaterIM* im_floater = FSFloaterIM::findInstance(im_session_id);
// </FS:Ansariel> [FS communication UI]
if (im_floater)
@ -957,7 +948,6 @@ void LLAvatarTracker::processTerminateFriendship(LLMessageSystem* msg, void**)
// <FS:Ansariel> FIRE-3248: Disable add friend button on IM floater if friendship request accepted
LLUUID im_session_id = LLIMMgr::computeSessionID(IM_NOTHING_SPECIAL, id);
// <FS:Ansariel> [FS communication UI]
//LLIMFloater* im_floater = LLIMFloater::findInstance(im_session_id);
FSFloaterIM* im_floater = FSFloaterIM::findInstance(im_session_id);
// </FS:Ansariel> [FS communication UI]
if (im_floater)

9
indra/newview/llchiclet.cpp
View File

@ -362,8 +362,7 @@ bool LLIMChiclet::getShowNewMessagesIcon()
void LLIMChiclet::onMouseDown()
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMSession::toggle(getSessionId()); <FS:TM> CHUI merge new
//LLIMFloater::toggle(getSessionId()); <FS:TM> CHUI Merge old
//LLFloaterIMSession::toggle(getSessionId());
FSFloaterIM::toggle(getSessionId());
// </FS:Ansariel> [FS communication UI]
}
@ -517,8 +516,7 @@ void LLChicletPanel::onCurrentVoiceChannelChanged(const LLUUID& session_id)
if (gSavedSettings.getBOOL("OpenIMOnVoice"))
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMContainer::getInstance()->showConversation(session_id); <FS:TM> CHUI Merge new
//LLIMFloater::show(chiclet->getSessionId()); <FS:TM> CHUI Merge old
//LLFloaterIMContainer::getInstance()->showConversation(session_id);
FSFloaterIM::show(chiclet->getSessionId());
// </FS:Ansariel> [FS communication UI]
}
@ -998,8 +996,7 @@ bool LLChicletPanel::isAnyIMFloaterDoked()
!= mChicletList.end(); it++)
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMSession* im_floater = LLFloaterReg::findTypedInstance<LLFloaterIMSession>( <FS:TM> CHUI Merge new
//LLIMFloater* im_floater = LLFloaterReg::findTypedInstance<LLIMFloater>( <FS:TM> CHUI Merge old
//LLFloaterIMSession* im_floater = LLFloaterReg::findTypedInstance<LLFloaterIMSession>(
// "impanel", (*it)->getSessionId());
FSFloaterIM* im_floater = LLFloaterReg::findTypedInstance<FSFloaterIM>(
"fs_impanel", (*it)->getSessionId());

4
indra/newview/llchicletbar.cpp
View File

@ -29,10 +29,6 @@
#include "llchiclet.h"
#include "lllayoutstack.h"
// <FS:Ansariel> [FS communication UI]
//#include "llimfloater.h" // for LLIMFloater <FS:TM> CHUI Merge LL removed this line
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
#include "llpaneltopinfobar.h"
#include "llsyswellwindow.h"

10
indra/newview/llfirstuse.cpp
View File

@ -73,15 +73,11 @@ void LLFirstUse::resetFirstUse()
// static
void LLFirstUse::otherAvatarChatFirst(bool enable)
{ // <FS:TM> CHUI Merge check
// <FS:Zi> Remove floating chat bar
//CHUI: firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24));
//FUI: firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "chat_bar").with("direction", "top_right").with("distance", 24));
{
// <FS:Ansariel> [FS communication UI]
firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24)); // <FS:TM> CHUI Merge lets try the CHUI line
//firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "fs_nearby_chat").with("direction", "top_right").with("distance", 24));
//firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "nearby_chat").with("direction", "top_right").with("distance", 24));
firstUseNotification("FirstOtherChatBeforeUser", enable, "HintChat", LLSD(), LLSD().with("target", "fs_nearby_chat").with("direction", "top_right").with("distance", 24));
// </FS:Ansariel> [FS communication UI]
// </FS:Zi>
}
// static

12
indra/newview/llfloaterconversationpreview.cpp
View File

@ -29,10 +29,10 @@
#include "llfloaterconversationpreview.h"
#include "llimview.h"
#include "lllineeditor.h"
// <FS:CR>
// <FS:CR> [FS communication UI]
//#include "llfloaterimnearbychat.h"
#include "fsfloaternearbychat.h"
// </FS:CR>
// </FS:CR> [FS communication UI]
#include "llspinctrl.h"
#include "lltrans.h"
#include "llviewercontrol.h" // <FS:CR>
@ -53,10 +53,10 @@ LLFloaterConversationPreview::LLFloaterConversationPreview(const LLSD& session_i
BOOL LLFloaterConversationPreview::postBuild()
{
// <FS:CR>
// <FS:CR> [FS communication UI]
//mChatHistory = getChild<LLChatHistory>("chat_history");
mChatHistory = getChild<FSChatHistory>("chat_history");
// <FS:CR>
// <FS:CR> [FS communication UI]
const LLConversation* conv = LLConversationLog::instance().getConversation(mSessionID);
std::string name;
@ -167,10 +167,10 @@ void LLFloaterConversationPreview::showHistory()
}
else if (from_id.isNull())
{
// <FS:CR> [Firestorm Communications UI ]
// <FS:CR> [FS communication UI]
//chat.mSourceType = LLFloaterIMNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
chat.mSourceType = FSFloaterNearbyChat::isWordsName(from) ? CHAT_SOURCE_UNKNOWN : CHAT_SOURCE_OBJECT;
// </FS:CR>
// </FS:CR> [FS communication UI]
}
LLSD chat_args;

8
indra/newview/llfloaterconversationpreview.h
View File

@ -26,10 +26,10 @@
#ifndef LLFLOATERCONVERSATIONPREVIEW_H_
#define LLFLOATERCONVERSATIONPREVIEW_H_
// <FS:CR>
// <FS:CR> [FS communication UI]
//#include "llchathistory.h"
#include "fschathistory.h"
// </FS:CR>
// </FS:CR> [FS communication UI]
#include "llfloater.h"
extern const std::string LL_FCP_COMPLETE_NAME; //"complete_name"
@ -54,10 +54,10 @@ private:
void showHistory();
LLSpinCtrl* mPageSpinner;
// <FS:CR>
// <FS:CR> [FS communication UI]
//LLChatHistory* mChatHistory;
FSChatHistory* mChatHistory;
// </FS:CR>
// </FS:CR> [FS communication UI]
LLUUID mSessionID;
int mCurrentPage;
int mPageSize;

24
indra/newview/llgroupactions.cpp
View File

@ -40,24 +40,19 @@
#include "llimview.h" // for gIMMgr
#include "llnotificationsutil.h"
#include "llstatusbar.h" // can_afford_transaction()
// <FS:Ansariel> [FS communication UI]
//#include "llimfloater.h" <FS:TM> CHU merge LL removed this
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
#include "groupchatlistener.h"
// [RLVa:KB] - Checked: 2011-03-28 (RLVa-1.3.0)
// Firestorm includes
#include "exogroupmutelist.h"
#include "fscontactsfloater.h"
#include "fsdata.h"
#include "fsfloatergroup.h"
#include "fsfloaterim.h"
#include "llpanelgroup.h"
#include "llslurl.h"
#include "rlvactions.h"
#include "rlvcommon.h"
#include "rlvhandler.h"
// [/RLVa:KB]
#include "exogroupmutelist.h"
// <FS:Ansariel> Standalone group floater
#include "fsfloatergroup.h"
#include "llpanelgroup.h"
// </FS:Ansariel>
#include "fscontactsfloater.h"
#include "fsdata.h"
//
// Globals
@ -499,8 +494,7 @@ LLUUID LLGroupActions::startIM(const LLUUID& group_id)
if (session_id != LLUUID::null)
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMContainer::getInstance()->showConversation(session_id); <FS:TM> CHUI Merge LL new
//LLIMFloater::show(session_id); <FS:TM> CHUI Merge LL old
//LLFloaterIMContainer::getInstance()->showConversation(session_id);
FSFloaterIM::show(session_id);
// </FS:Ansariel> [FS communication UI]
}

52
indra/newview/llimview.cpp
View File

@ -51,8 +51,8 @@
#include "llcallingcard.h"
#include "llchat.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaterimsession.h" <FS:TM> CHUI Merge new
//#include "llfloaterimcontainer.h" <FS:TM> CHUI Merge new
//#include "llfloaterimsession.h"
//#include "llfloaterimcontainer.h"
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
#include "llgroupiconctrl.h"
@ -145,14 +145,14 @@ void process_dnd_im(const LLSD& notification)
false,
false); //will need slight refactor to retrieve whether offline message or not (assume online for now)
// [CHUI Merge] Do we need this?
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMContainer* im_box = LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container");
//
//if (im_box)
//{
// im_box->flashConversationItemWidget(sessionID, true);
//}
// [CHUI Merge]
// </FS:Ansariel> [FS communication UI]
}
}
@ -908,7 +908,6 @@ void LLIMModel::LLIMSession::buildHistoryFileName()
// LLAvatarName av_name;
// // For outgoing sessions we already have a cached name
// // so no need for a callback in LLAvatarNameCache::get()
//<FS:TM> CHUI Merge below is new if statement from LL
// if (LLAvatarNameCache::get(mOtherParticipantID, &av_name))
// {
// mHistoryFileName = LLCacheName::buildUsername(av_name.getUserName());
@ -917,26 +916,6 @@ void LLIMModel::LLIMSession::buildHistoryFileName()
// {
// // Incoming P2P sessions include a name that we can use to build a history file name
// mHistoryFileName = LLCacheName::buildUsername(mName);
// }
// }
//}
//<FS:TM> CHUI Merge below is the old if statement from LL
// if (LLAvatarNameCache::get(mOtherParticipantID, &av_name))
// {
// if (av_name.mUsername.empty())
// {
// // Display names are off, use mDisplayName which will be the legacy name
// mHistoryFileName = LLCacheName::buildUsername(av_name.getDisplayName());
// }
// else
// {
// mHistoryFileName = av_name.mUsername;
// }
// }
// else
// {
// // Incoming P2P sessions include a name that we can use to build a history file name
// mHistoryFileName = LLCacheName::buildUsername(mName);
// }
}
else
@ -2934,6 +2913,7 @@ void LLIMMgr::addMessage(
// <FS:PP> Configurable IM sounds
static LLCachedControl<U32> PlayModeUISndNewIncomingIMSession(gSavedSettings, "PlayModeUISndNewIncomingIMSession");
static LLCachedControl<U32> PlayModeUISndNewIncomingGroupIMSession(gSavedSettings, "PlayModeUISndNewIncomingGroupIMSession");
BOOL do_not_disturb = gAgent.isDoNotDisturb();
// </FS:PP> Configurable IM sounds
bool new_session = !hasSession(new_session_id);
@ -3001,29 +2981,28 @@ void LLIMMgr::addMessage(
}
// <FS:PP> Configurable IM sounds
if(PlayModeUISndNewIncomingIMSession != 0 && dialog == IM_NOTHING_SPECIAL)
// //Play sound for new conversations
// if (!gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation") == TRUE))
if(!do_not_disturb && PlayModeUISndNewIncomingIMSession != 0 && dialog == IM_NOTHING_SPECIAL)
{
//Play sound for new conversations
if (!gAgent.isDoNotDisturb() && (gSavedSettings.getBOOL("PlaySoundNewConversation") == TRUE))
{
make_ui_sound("UISndNewIncomingIMSession");
}
else if(PlayModeUISndNewIncomingGroupIMSession != 0 && dialog != IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession != 0 && dialog != IM_NOTHING_SPECIAL)
{
make_ui_sound("UISndNewIncomingGroupIMSession");
}
}
else if(PlayModeUISndNewIncomingIMSession == 2 && dialog == IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingIMSession == 2 && dialog == IM_NOTHING_SPECIAL)
{
make_ui_sound("UISndNewIncomingIMSession");
}
else if(PlayModeUISndNewIncomingGroupIMSession == 2 && dialog != IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession == 2 && dialog != IM_NOTHING_SPECIAL)
{
make_ui_sound("UISndNewIncomingGroupIMSession");
// </FS:PP>
}
// <FS:WoLf> IM Sounds only for sessions not in focus
else if(PlayModeUISndNewIncomingIMSession == 3 && dialog == IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingIMSession == 3 && dialog == IM_NOTHING_SPECIAL)
{
// <FS:Ansariel> [FS communication UI]
//LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
@ -3034,7 +3013,7 @@ void LLIMMgr::addMessage(
make_ui_sound("UISndNewIncomingIMSession");
}
}
else if(PlayModeUISndNewIncomingGroupIMSession == 3 && dialog != IM_NOTHING_SPECIAL)
else if(!do_not_disturb && PlayModeUISndNewIncomingGroupIMSession == 3 && dialog != IM_NOTHING_SPECIAL)
{
// <FS:Ansariel> [FS communication UI]
//LLIMFloater* im_floater = LLIMFloater::findInstance(session_id);
@ -3045,7 +3024,6 @@ void LLIMMgr::addMessage(
make_ui_sound("UISndNewIncomingGroupIMSession");
}
}
}
// </FS:WoLf>
bool skip_message = false;
@ -3065,14 +3043,14 @@ void LLIMMgr::addMessage(
}
// Open conversation floater if offline messages are present
// [CHUI Merge]
// <FS:Ansariel> [FS communication UI]
//if (is_offline_msg)
// {
// LLFloaterReg::showInstance("im_container");
// LLFloaterReg::getTypedInstance<LLFloaterIMContainer>("im_container")->
// flashConversationItemWidget(new_session_id, true);
// }
// [CHUI Merge]
// </FS:Ansariel> [FS communication UI]
}
void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& message_name, const LLSD& args)

40
indra/newview/llinventorybridge.cpp
View File

@ -4356,7 +4356,6 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item,
// Check whether the item being dragged from active inventory panel
// passes the filter of the destination panel.
// <FS:Ansariel> Allow drag and drop in inventory regardless of filter (e.g. Recent)
// <FS:TM> CHUI merge LL changed below, kept commented out
//if (accept && active_panel)
//{
// LLFolderViewItem* fv_item = active_panel->getItemByID(inv_item->getUUID());
@ -5786,25 +5785,26 @@ bool confirm_attachment_rez(const LLSD& notification, const LLSD& response)
if (itemp)
{
// /*
// {
// U8 attachment_pt = notification["payload"]["attachment_point"].asInteger();
// LLMessageSystem* msg = gMessageSystem;
// msg->newMessageFast(_PREHASH_RezSingleAttachmentFromInv);
// msg->nextBlockFast(_PREHASH_AgentData);
// msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
// msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
// msg->nextBlockFast(_PREHASH_ObjectData);
// msg->addUUIDFast(_PREHASH_ItemID, itemp->getUUID());
// msg->addUUIDFast(_PREHASH_OwnerID, itemp->getPermissions().getOwner());
// msg->addU8Fast(_PREHASH_AttachmentPt, attachment_pt);
// pack_permissions_slam(msg, itemp->getFlags(), itemp->getPermissions());
// msg->addStringFast(_PREHASH_Name, itemp->getName());
// msg->addStringFast(_PREHASH_Description, itemp->getDescription());
// msg->sendReliable(gAgent.getRegion()->getHost());
// return false;
// }
// */
/*
{
U8 attachment_pt = notification["payload"]["attachment_point"].asInteger();
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_RezSingleAttachmentFromInv);
msg->nextBlockFast(_PREHASH_AgentData);
msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
msg->nextBlockFast(_PREHASH_ObjectData);
msg->addUUIDFast(_PREHASH_ItemID, itemp->getUUID());
msg->addUUIDFast(_PREHASH_OwnerID, itemp->getPermissions().getOwner());
msg->addU8Fast(_PREHASH_AttachmentPt, attachment_pt);
pack_permissions_slam(msg, itemp->getFlags(), itemp->getPermissions());
msg->addStringFast(_PREHASH_Name, itemp->getName());
msg->addStringFast(_PREHASH_Description, itemp->getDescription());
msg->sendReliable(gAgent.getRegion()->getHost());
return false;
}
*/
// Queue up attachments to be sent in next idle tick, this way the
// attachments are batched up all into one message versus each attachment

8
indra/newview/llinventorybridge.h
View File

@ -160,9 +160,9 @@ protected:
BOOL isLostInventory() const;
// [/SL:KB]
BOOL isCOFFolder() const; // true if COF or descendent of
//-TT Client LSL Bridge
// <FS:TT> Client LSL Bridge
BOOL isProtectedFolder() const;
//-TT
// </FS:TT>
BOOL isInboxFolder() const; // true if COF or descendent of marketplace inbox
BOOL isOutboxFolder() const; // true if COF or descendent of marketplace outbox
BOOL isOutboxFolderDirectParent() const;
@ -349,9 +349,9 @@ protected:
BOOL checkFolderForContentsOfType(LLInventoryModel* model, LLInventoryCollectFunctor& typeToCheck);
void modifyOutfit(BOOL append);
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
void modifyOutfit(BOOL append, BOOL replace);
//-TT
// </FS:TT>
void determineFolderType();
void dropToFavorites(LLInventoryItem* inv_item);

1
indra/newview/llinventoryfilter.cpp
View File

@ -120,7 +120,6 @@ bool LLInventoryFilter::check(const LLFolderViewModelItem* item)
// Clipboard cut items are *always* filtered so we need this value upfront
// <FS:Ansariel> FIRE-6714: Don't move objects to trash during cut&paste
// Don't hide cut items in inventory
//const LLFolderViewEventListener* listener = item->getListener(); <FS:TM> CHUI merge LL removed thie line
//const BOOL passed_clipboard = (listener ? checkAgainstClipboard(listener->getUUID()) : TRUE);
const BOOL passed_clipboard = TRUE;
// </FS:Ansariel> FIRE-6714: Don't move objects to trash during cut&paste

7
indra/newview/llinventorymodel.cpp
View File

@ -1453,13 +1453,6 @@ void LLInventoryModel::idleNotifyObservers()
notifyObservers();
}
//-TT 2.6.9 - function deprecated
void LLInventoryModel::notifyObservers(const std::string service_name)
{
llinfos << "Calling deprecated function <notifyObservers(const std::string service_name)> with (" << service_name << ") parameter" << llendl;
notifyObservers();
}
// Call this method when it's time to update everyone on a new state.
void LLInventoryModel::notifyObservers()
{

14
indra/newview/llinventorymodel.h
View File

@ -40,10 +40,10 @@
#include <set>
#include <string>
#include <vector>
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
#include "llviewerobjectlist.h"
#include "llvoavatarself.h"
//-TT
// </FS:TT>
class LLInventoryObserver;
class LLInventoryObject;
@ -134,11 +134,11 @@ private:
LLUUID mLibraryRootFolderID;
LLUUID mLibraryOwnerID;
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
item_array_t mItemArray;
item_array_t mObjArray;
LLDynamicArray<std::string> mAttPoints;
//-TT
// </FS:TT>
//--------------------------------------------------------------------
// Structure
@ -281,7 +281,7 @@ public:
const LLUUID& getLinkedItemID(const LLUUID& object_id) const;
LLViewerInventoryItem* getLinkedItem(const LLUUID& object_id) const;
//-TT Patch: ReplaceWornItemsOnly
// <FS:TT> ReplaceWornItemsOnly
void wearItemsOnAvatar(LLInventoryCategory* category);
void wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object, const LLViewerJointAttachment *attachment);
@ -289,7 +289,7 @@ private:
void wearWearablesOnAvatar(LLUUID category_id);
void wearAttachmentsOnAvatar(LLUUID category_id);
void wearGesturesOnAvatar(LLUUID category_id);
//-TT
// </FS:TT>
private:
mutable LLPointer<LLViewerInventoryItem> mLastItem; // cache recent lookups
@ -477,8 +477,6 @@ public:
// notifyObservers() manually to update regardless of whether state change
// has been indicated.
void idleNotifyObservers();
//-TT 2.6.9 - function deprecated
void notifyObservers(const std::string service_name);
// Call to explicitly update everyone on a new state.
void notifyObservers();

3
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@ -183,9 +183,8 @@ void LLInventoryModelBackgroundFetch::backgroundFetchCB(void *)
void LLInventoryModelBackgroundFetch::backgroundFetch()
{
// <FS:TM> new: if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
// <FS:AW>
// <FS:TM> old: if (mBackgroundFetchActive && gAgent.getRegion())
//if (mBackgroundFetchActive && gAgent.getRegion() && gAgent.getRegion()->capabilitiesReceived())
LLViewerRegion* region = gAgent.getRegion();
if (!region || !region->capabilitiesReceived())
{

16
indra/newview/llmutelist.cpp
View File

@ -784,19 +784,3 @@ void LLMuteList::notifyObservers()
it = mObservers.upper_bound(observer);
}
}
// <FS:Ansariel> Agent profile button
LLMute LLMuteList::getMute(const LLUUID& id)
{
LLMute mute(id);
mute_set_t::iterator found = mMutes.find(mute);
if (found != mMutes.end())
{
return (*found);
}
else
{
return LLMute(LLUUID::null);
}
}
// </FS:Ansariel>

3
indra/newview/llmutelist.h
View File

@ -117,9 +117,6 @@ public:
// call this method on logout to save everything.
void cache(const LLUUID& agent_id);
// <FS:Ansariel> Agent profile button
LLMute getMute(const LLUUID& id);
private:
BOOL loadFromFile(const std::string& filename);
BOOL saveToFile(const std::string& filename);

18
indra/newview/llnavigationbar.cpp
View File

@ -320,20 +320,8 @@ BOOL LLNavigationBar::postBuild()
setTeleportFailedCallback(boost::bind(&LLNavigationBar::onTeleportFailed, this));
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
// LLFavoritesBarCtrl* fp = getChild<LLFavoritesBarCtrl>("favorite");
// LLPanel* np = getChild<LLPanel>("navigation_panel");
// LLPanel* navFrame = getChild<LLPanel>("navigation_bar");
// mDefaultNavContainerRect = getRect();
// mDefaultFpRect = fp->getRect();
// mDefaultNpRect = np->getRect();
// mDefaultFrameRect = navFrame->getRect();
// mDefaultNavContainerRect.set(mDefaultNavContainerRect.mLeft, mDefaultNpRect.mTop,mDefaultNavContainerRect.mRight, mDefaultFpRect.mBottom);
// setRect(mDefaultNavContainerRect);
// navFrame->setRect(mDefaultFrameRect);
// np->setRect(mDefaultNpRect);
// fp->setRect(mDefaultFpRect);
//mDefaultNbRect = getRect();
//mDefaultFpRect = getChild<LLFavoritesBarCtrl>("favorite")->getRect();
// </FS:Zi>
// we'll be notified on teleport history changes
@ -779,7 +767,7 @@ void LLNavigationBar::clearHistoryCache()
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
// int LLNavigationBar::getDefNavBarHeight()
// {
// return mDefaultNpRect.getHeight();
// return mDefaultNbRect.getHeight();
// }
// int LLNavigationBar::getDefFavBarHeight()
// {

10
indra/newview/llnavigationbar.h
View File

@ -146,12 +146,10 @@ private:
LLButton* mBtnHome;
LLSearchComboBox* mSearchComboBox;
LLLocationInputCtrl* mCmbLocation;
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
// LLRect mDefaultNpRect;
// LLRect mDefaultNavContainerRect;
// LLRect mDefaultFpRect;
// LLRect mDefaultFrameRect;
// </FS:Zi>
// <FS:Zi> No size calculations in code please. XUI handles it all now with visibility_control
//LLRect mDefaultNbRect;
//LLRect mDefaultFpRect;
// <7FS:Zi>
boost::signals2::connection mTeleportFailedConnection;
boost::signals2::connection mTeleportFinishConnection;
boost::signals2::connection mHistoryMenuConnection;

4
indra/newview/llnotificationhandler.h
View File

@ -40,8 +40,7 @@
#include "llavatarname.h"
// <FS:Ansariel> [FS communication UI]
//class LLIMFloater; <FS:TM> CHUI Merge old
//class LLFloaterIMSession; <FS:TM> CHUI Merge new
//class LLFloaterIMSession;
class FSFloaterIM;
// </FS:Ansariel> [FS communication UI]
@ -368,7 +367,6 @@ private:
* Find IM floater based on "from_id"
*/
// <FS:Ansariel> [FS communication UI]
//static LLIMFloater* findIMFloater(const LLNotificationPtr& notification);
static FSFloaterIM* findIMFloater(const LLNotificationPtr& notification);
// </FS:Ansariel> [FS communication UI]

10
indra/newview/llnotificationhandlerutil.cpp
View File

@ -35,8 +35,7 @@
#include "llagent.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaterimsession.h" <FS:TM> CHUI Merge new
//#include "llimfloater.h" <FS:TM> CHUI Merge old
//#include "llfloaterimsession.h"
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
#include "llimview.h"
@ -119,7 +118,6 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
// [SL:KB] - Patch: Chat-Logs | Checked: 2010-11-18 (Catznip-2.4.0c) | Added: Catznip-2.4.0c
LLIMModel::instance().logToFile(file_name, from, from_id, message);
// [/SL:KB]
//-TT 2.8.2 merge changes - left out for now
//// Build a new format username or firstname_lastname for legacy names
//// to use it for a history log filename.
//std::string user_name = LLCacheName::buildUsername(session_name);
@ -256,8 +254,7 @@ void LLHandlerUtil::logGroupNoticeToIMGroup(
void LLHandlerUtil::logToNearbyChat(const LLNotificationPtr& notification, EChatSourceType type)
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"); <FS:TM> CHUI Merge new (including odd white space)
//LLFloaterNearbyChat* nearby_chat = LLFloaterNearbyChat::getInstance(); <FS:TM> CHUI Merge old
//LLFloaterIMNearbyChat* nearby_chat = LLFloaterReg::findTypedInstance<LLFloaterIMNearbyChat>("nearby_chat");
FSFloaterNearbyChat* nearby_chat = FSFloaterNearbyChat::getInstance();
// </FS:Ansariel> [FS communication UI]
if (nearby_chat)
@ -349,8 +346,7 @@ void LLHandlerUtil::addNotifPanelToIM(const LLNotificationPtr& notification)
void LLHandlerUtil::updateIMFLoaterMesages(const LLUUID& session_id)
{
// <FS:Ansariel> [FS communication UI]
//LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id); <FS:TM> CHUI Merge new
//LLIMFloater* im_floater = LLIMFloater::findInstance(session_id); <FS:TM> CHUI Merge old
//LLFloaterIMSession* im_floater = LLFloaterIMSession::findInstance(session_id);
FSFloaterIM* im_floater = FSFloaterIM::findInstance(session_id);
// </FS:Ansariel> [FS communication UI]
if (im_floater != NULL && im_floater->getVisible())

3
indra/newview/llpanelmaininventory.cpp
View File

@ -906,8 +906,7 @@ void LLPanelMainInventory::onFocusReceived()
void LLPanelMainInventory::setFilterTextFromFilter()
{
//mFilterText = mActivePanel->getFilter()->getFilterText(); <FS:TM> CHUI Merge old
//mFilterText = mActivePanel->getFilter().getFilterText(); <FS:TM> CHUI Merge new
//mFilterText = mActivePanel->getFilter().getFilterText();
// ## Zi: Filter dropdown
// this method gets called by the filter subwindow (once every frame), so we update our combo box here
LLInventoryFilter &filter = mActivePanel->getFilter();

19
indra/newview/llplacesinventorypanel.cpp
View File

@ -121,22 +121,3 @@ S32 LLPlacesInventoryPanel::notify(const LLSD& info)
}
return 0;
}
//} <FS:TM> CHUI Merge error
//
//BOOL LLPlacesFolderView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
// EDragAndDropType cargo_type,
// void* cargo_data,
// EAcceptance* accept,
// std::string& tooltip_msg)
//{
// // Don't accept anything except landmarks and folders to be dropped
// // in places folder view. See STORM-296.
// if (cargo_type != DAD_LANDMARK && cargo_type != DAD_CATEGORY)
// {
// *accept = ACCEPT_NO;
// return FALSE;
// }
//
// return LLFolderView::handleDragAndDrop(x, y, mask, drop, cargo_type, cargo_data,
// accept, tooltip_msg);

6
indra/newview/llplacesinventorypanel.h
View File

@ -56,10 +56,4 @@ private:
LLSaveFolderState* mSavedFolderState;
};
/*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
EDragAndDropType cargo_type,
void* cargo_data,
EAcceptance* accept,
std::string& tooltip_msg);
#endif //LL_LLINVENTORYSUBTREEPANEL_H

6
indra/newview/llsaveoutfitcombobtn.cpp
View File

@ -31,8 +31,6 @@
#include "llsidepanelappearance.h"
#include "llsaveoutfitcombobtn.h"
#include "llviewermenu.h"
#include "llagent.h"
#include "llviewerregion.h"
static const std::string SAVE_BTN("save_btn");
static const std::string SAVE_FLYOUT_BTN("save_flyout_btn");
@ -80,10 +78,6 @@ void LLSaveOutfitComboBtn::saveOutfit(bool as_new)
panel_outfits_inventory->onSave();
}
if ( gAgent.getRegion() && gAgent.getRegion()->getCentralBakeVersion())
{
LLAppearanceMgr::instance().requestServerAppearanceUpdate();
}
//*TODO how to get to know when base outfit is updated or new outfit is created?
}

5
indra/newview/llsidepanelappearance.cpp
View File

@ -232,11 +232,6 @@ void LLSidepanelAppearance::updateToVisibility(const LLSD &new_visibility)
gAgentCamera.changeCameraToDefault();
gAgentCamera.resetView();
}
if ( mEditWearable->getVisible() )
{
mEditWearable->revertChanges();
}
}
}

5
indra/newview/llstartup.cpp
View File

@ -194,10 +194,6 @@
#include "llvoicechannel.h"
#include "llpathfindingmanager.h"
// [RLVa:KB] - Checked: 2010-02-27 (RLVa-1.2.0a)
#include "rlvhandler.h"
// [/RLVa:KB]
#include "lllogin.h"
#include "llevents.h"
#include "llstartuplistener.h"
@ -2616,7 +2612,6 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x,
LLAgentPicksInfo::getInstance()->requestNumberOfPicks();
// <FS:Ansariel> [FS communication UI]
//LLIMFloater::initIMFloater();
//FSFloaterIM::initIMFloater(); <FS:TM> CHUI Merge LL removed this, check if still needed
// </FS:Ansariel> [FS communication UI]
display_startup();

6
indra/newview/lltoastnotifypanel.cpp
View File

@ -41,8 +41,7 @@
#include "llnotificationsutil.h"
#include "llviewermessage.h"
// <FS:Ansariel> [FS communication UI]
//#include "llfloaterimsession.h" <FS:TM> CHUI Merge new
//#include "llimfloater.h" <FS:TM> CHUI Merge old
//#include "llfloaterimsession.h"
#include "fsfloaterim.h"
// </FS:Ansariel> [FS communication UI]
@ -199,9 +198,10 @@ void LLToastNotifyPanel::updateButtonsLayout(const std::vector<index_button_pair
mute_btn_rect.setOriginAndSize(mute_btn_left, BOTTOM_PAD,// always move mute button at the bottom
mute_btn_rect.getWidth(), mute_btn_rect.getHeight());
mute_btn->setRect(mute_btn_rect);
mControlPanel->addChild(mute_btn);
mControlPanel->addChild(mute_btn);
}
}
void LLToastNotifyPanel::adjustPanelForScriptNotice(S32 button_panel_width, S32 button_panel_height)
{
//adjust layout

2
indra/newview/llviewerfloaterreg.cpp
View File

@ -236,9 +236,7 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("fs_nearby_chat", "floater_fs_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterNearbyChat>);
// </FS:Ansariel> [FS communication UI]
LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);
// <FS:Ansariel> [FS communication UI]
LLFloaterReg::add("conversation", "floater_conversation_log.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterConversationLog>);
// </FS:Ansariel> [FS communication UI]
LLFloaterReg::add("destinations", "floater_destinations.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterDestinations>);

2
indra/newview/llviewermenu.cpp
View File

@ -9988,7 +9988,7 @@ void initialize_menus()
view_listener_t::addEnable(new LLUploadCostCalculator(), "Upload.CalculateCosts");
// [CHUI Merge]
// <FS:Ansariel> [FS communication UI]
//enable.add("Conversation.IsConversationLoggingAllowed", boost::bind(&LLFloaterIMContainer::isConversationLoggingAllowed));
// Agent

61
indra/newview/llviewermessage.cpp
View File

@ -2769,35 +2769,36 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
// if there is not a panel for this conversation (i.e. it is a new IM conversation
// initiated by the other party) then...
send_do_not_disturb_message(msg, from_id, session_id);
// <FS:TM> CHUI Merge LL changed this
//std::string response;
//LLAgentUI::buildFullname(my_name);
//if (is_busy)
//{
// response = gSavedPerAccountSettings.getString("BusyModeResponse");
//}
//else if (is_autorespond_nonfriends && !is_friend)
//{
// response = gSavedPerAccountSettings.getString("FSAutorespondNonFriendsResponse");
//}
//else if (is_autorespond)
//{
// response = gSavedPerAccountSettings.getString("FSAutorespondModeResponse");
//}
//pack_instant_message( <FS:TM> CHUI Merge LL removed this and below, comented out above to be looked at later
// gMessageSystem,
// gAgent.getID(),
// FALSE,
// gAgent.getSessionID(),
// from_id,
// my_name,
// response,
// IM_ONLINE,
// IM_BUSY_AUTO_RESPONSE,
// session_id);
//gAgent.sendReliableMessage();
//<FS:TM> CHUI Merge End
// <FS:Ansariel> FS autoresponse feature
//send_do_not_disturb_message(msg, from_id, session_id);
std::string my_name;
std::string response;
LLAgentUI::buildFullname(my_name);
if (is_do_not_disturb)
{
response = gSavedPerAccountSettings.getString("DoNotDisturbModeResponse");
}
else if (is_autorespond_nonfriends && !is_friend)
{
response = gSavedPerAccountSettings.getString("FSAutorespondNonFriendsResponse");
}
else if (is_autorespond)
{
response = gSavedPerAccountSettings.getString("FSAutorespondModeResponse");
}
pack_instant_message(
gMessageSystem,
gAgent.getID(),
FALSE,
gAgent.getSessionID(),
from_id,
my_name,
response,
IM_ONLINE,
IM_DO_NOT_DISTURB_AUTO_RESPONSE,
session_id);
gAgent.sendReliableMessage();
// </FS:Ansariel> FS autoresponse feature
}
// <FS:Ansariel> checkfor and process reqinfo
@ -4571,7 +4572,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
{
gTeleportDisplay = TRUE;
gAgent.setTeleportState( LLAgent::TELEPORT_START );
make_ui_sound("UISndTeleportOut"); //AO
make_ui_sound("UISndTeleportOut");
LL_INFOS("Messaging") << "Teleport initiated by remote TeleportStart message with TeleportFlags: " << teleport_flags << LL_ENDL;

19
indra/newview/llviewerthrottle.cpp
View File

@ -34,11 +34,6 @@
#include "llviewerstats.h"
#include "lldatapacker.h"
//<FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
#include "lltrans.h"
#include "llnotificationsutil.h"
//</FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
using namespace LLOldEvents;
// consts
@ -152,20 +147,6 @@ LLViewerThrottleGroup LLViewerThrottleGroup::operator-(const LLViewerThrottleGro
void LLViewerThrottleGroup::sendToSim() const
{
llinfos << "Sending throttle settings, total BW " << mThrottleTotal << llendl;
//<FS:TS> FIRE-6795: Remove warning at every login
//<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//static bool bandwidth_warning_latch = false;//<FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
//S32 newBandwidth=(S32) gSavedSettings.getF32("ThrottleBandwidthKBPS");
//gSavedSettings.setBOOL("BandwidthSettingTooHigh",newBandwidth>1500);
//</FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues
//<FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
//if ( gSavedSettings.getBOOL("BandwidthSettingTooHigh") && !bandwidth_warning_latch )
// {
// LLNotificationsUtil::add("FSCmdLineBWTooHigh", LLSD());
// bandwidth_warning_latch = true;
// }
//</FS:HG> FIRE-6340, FIRE-6567 - addendum - don't spam chat
//</FS:TS> FIRE-6795
LLMessageSystem* msg = gMessageSystem;
msg->newMessageFast(_PREHASH_AgentThrottle);

103
indra/newview/llviewerwindow.cpp
View File

@ -2023,22 +2023,8 @@ void LLViewerWindow::initWorldUI()
// <FS:Zi> Is done inside XUI now, using visibility_control
// if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
// {
// // <FS:Ansariel> Re-enable separate toggle for navigation and favorites panel
// //navbar->setVisible(FALSE);
// navbar->showNavigationPanel(FALSE);
// navbar->setVisible(FALSE);
// }
// // <FS:Ansariel> Re-enable separate toggle for navigation and favorites panel
// if (!gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"))
// {
// navbar->showFavoritesPanel(FALSE);
// }
// // </FS:Ansariel>
// if (!gSavedSettings.getBOOL("ShowSearchTopBar"))
// {
// navbar->childSetVisible("search_combo_box",FALSE);
// }
// </FS:Zi>
if (!gSavedSettings.getBOOL("ShowMenuBarLocation"))
@ -2447,18 +2433,14 @@ void LLViewerWindow::setNormalControlsVisible( BOOL visible )
}
// <FS:Zi> Is done inside XUI now, using visibility_control
// LLNavigationBar* navbarp = LLUI::getRootView()->findChild<LLNavigationBar>("navigation_bar");
// if (navbarp)
// {
// // when it's time to show navigation bar we need to ensure that the user wants to see it
// // i.e. ShowNavbarNavigationPanel option is true
// // <FS:Ansariel> Separate navigation and favorites panel
// //navbarp->setVisible( visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel") );
// navbarp->showNavigationPanel(visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel"));
// navbarp->showFavoritesPanel(visible && gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"));
// // </FS:Ansariel> Separate navigation and favorites panel
// }
// </FS_Zi>
//LLNavigationBar* navbarp = LLUI::getRootView()->findChild<LLNavigationBar>("navigation_bar");
//if (navbarp)
//{
// // when it's time to show navigation bar we need to ensure that the user wants to see it
// // i.e. ShowNavbarNavigationPanel option is true
// navbarp->setVisible( visible && gSavedSettings.getBOOL("ShowNavbarNavigationPanel") );
//}
// </FS:Zi>
}
void LLViewerWindow::setMenuBackgroundColor(bool god_mode, bool dev_grid)
@ -5454,12 +5436,22 @@ S32 LLViewerWindow::getChatConsoleBottomPad()
if(gToolBarView)
{
// FS:Ansariel This gets called every frame, so don't call getChild/findChild every time!
offset += gToolBarView->getBottomToolbar()->getRect().getHeight();
LLView* chat_stack = gToolBarView->getBottomChatStack();
if (chat_stack)
// <FS:KC> Tie console to legacy snap edge when possible
static LLUICachedControl<bool> legacy_snap ("FSLegacyEdgeSnap", false);
if (legacy_snap)
{
offset = chat_stack->getRect().getHeight();
LLRect snap_rect = gFloaterView->getSnapRect();
offset = snap_rect.mBottom;
}// </FS:KC> Tie console to legacy snap edge when possible
else
{
// FS:Ansariel This gets called every frame, so don't call getChild/findChild every time!
offset += gToolBarView->getBottomToolbar()->getRect().getHeight();
LLView* chat_stack = gToolBarView->getBottomChatStack();
if (chat_stack)
{
offset = chat_stack->getRect().getHeight();
}
}
}
// </FS:Ansariel>
@ -5482,9 +5474,6 @@ LLRect LLViewerWindow::getChatConsoleRect()
console_rect.mLeft += CONSOLE_PADDING_LEFT;
// <FS:Ansariel> This also works without relog!
//static const BOOL CHAT_FULL_WIDTH = gSavedSettings.getBOOL("ChatFullWidth");
//if (CHAT_FULL_WIDTH)
static LLCachedControl<bool> chatFullWidth(gSavedSettings, "ChatFullWidth");
if (chatFullWidth)
// </FS:Ansariel>
@ -5507,18 +5496,36 @@ LLRect LLViewerWindow::getChatConsoleRect()
// <FS:Ansariel> Push the chat console out of the way of the vertical toolbars
if (gToolBarView)
{
LLToolBar* toolbar_left = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_LEFT);
if (toolbar_left && toolbar_left->hasButtons())
// <FS:KC> Tie console to legacy snap edge when possible
static LLUICachedControl<bool> legacy_snap ("FSLegacyEdgeSnap", false);
if (legacy_snap)
{
console_rect.mLeft += toolbar_left->getRect().getWidth();
}
LLRect snap_rect = gFloaterView->getSnapRect();
if (console_rect.mRight > snap_rect.mRight)
{
console_rect.mRight = snap_rect.mRight;
}
LLToolBar* toolbar_right = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_RIGHT);
LLRect toolbar_right_screen_rect;
toolbar_right->localRectToScreen(toolbar_right->getRect(), &toolbar_right_screen_rect);
if (toolbar_right && toolbar_right->hasButtons() && console_rect.mRight >= toolbar_right_screen_rect.mLeft)
if (console_rect.mLeft < snap_rect.mLeft)
{
console_rect.mLeft = snap_rect.mLeft;
}
}// </FS:KC> Tie console to legacy snap edge when possible
else
{
console_rect.mRight -= toolbar_right->getRect().getWidth();
LLToolBar* toolbar_left = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_LEFT);
if (toolbar_left && toolbar_left->hasButtons())
{
console_rect.mLeft += toolbar_left->getRect().getWidth();
}
LLToolBar* toolbar_right = gToolBarView->getToolBar(LLToolBarView::TOOLBAR_RIGHT);
LLRect toolbar_right_screen_rect;
toolbar_right->localRectToScreen(toolbar_right->getRect(), &toolbar_right_screen_rect);
if (toolbar_right && toolbar_right->hasButtons() && console_rect.mRight >= toolbar_right_screen_rect.mLeft)
{
console_rect.mRight -= toolbar_right->getRect().getWidth();
}
}
}
// </FS:Ansariel>
@ -5548,13 +5555,7 @@ void LLViewerWindow::setUIVisibility(bool visible)
}
// <FS:Zi> Is done inside XUI now, using visibility_control
// // <FS:Ansariel> Separate navigation and favorites panel
// //LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
// LLNavigationBar::getInstance()->showNavigationPanel(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
// LLNavigationBar::getInstance()->showFavoritesPanel(visible ? gSavedSettings.getBOOL("ShowNavbarFavoritesPanel"): FALSE);
// // </FS:Ansariel> Separate navigation and favorites panel
// </FS:Zi>
//LLNavigationBar::getInstance()->setVisible(visible ? gSavedSettings.getBOOL("ShowNavbarNavigationPanel") : FALSE);
LLPanelTopInfoBar::getInstance()->setVisible(visible? gSavedSettings.getBOOL("ShowMiniLocationPanel") : FALSE);
mRootView->getChildView("status_bar_container")->setVisible(visible);
}

36
indra/newview/llvoavatar.cpp
View File

@ -2942,13 +2942,12 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
if (mClientTagData.has("name") && !mClientTagData["name"].asString().empty())
{
addNameTagLine(av_name.getDisplayName()+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif());
addNameTagLine(av_name.getDisplayName()+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), (!av_name.getDisplayName().empty()) );
}
else
{
addNameTagLine(av_name.getDisplayName(), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif());
addNameTagLine(av_name.getDisplayName(), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), true);
}
}
// Suppress SLID display if display name matches exactly (ugh)
@ -2958,9 +2957,13 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// <FS:CR> FIRE-1061
LLColor4 username_color;
if (colorize_username)
{
username_color = LLUIColorTable::instance().getColor("NameTagUsername", LLColor4::white);
}
else
{
username_color = name_tag_color * 0.83f;
}
// </FS:CR>
// Show user name as legacy name if selected -- TS
@ -2969,14 +2972,13 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
{
username = LLCacheName::buildFullName( firstname->getString(), lastname->getString() );
}
addNameTagLine(username, username_color, LLFontGL::NORMAL,
LLFontGL::getFontSansSerifSmall());
addNameTagLine(username, username_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerifSmall());
}
// [RLVa:KB] - Checked: 2010-10-31 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a
}
else
{
addNameTagLine(RlvStrings::getAnonym(av_name), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif());
addNameTagLine(RlvStrings::getAnonym(av_name), name_tag_color, LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), (!av_name.getDisplayName().empty()) );
}
// [/RLVa:KB]
}
@ -2988,7 +2990,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
if ( (fRlvShowNames) && (!isSelf()) )
{
full_name = RlvStrings::getAnonym(full_name);
addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font);
addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font, true);
}
// [/RLVa:KB]
else // Only check for client tags when not RLV anon -AO
@ -2996,11 +2998,11 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
if (mClientTagData.has("name") && !mClientTagData["name"].asString().empty())
{
lldebugs << "ClientTag is set! mClientTag=" << mClientTagData["name"].asString() << llendl;
addNameTagLine(full_name+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif());
addNameTagLine(full_name+" (" + mClientTagData["name"].asString() + ")",name_tag_color,LLFontGL::NORMAL, LLFontGL::getFontSansSerif(), true);
}
else
{
addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font);
addNameTagLine(full_name, name_tag_color, LLFontGL::NORMAL, font, true);
}
}
}
@ -3118,7 +3120,10 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
}
}
void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font)
// <FS:Ansariel> Fix nametag not properly updating when display name arrives
//void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font)
void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font, bool is_name /* = false */)
// </FS:Ansariel>
{
llassert(mNameText);
if (mVisibleChat || mVisibleTyping)
@ -3129,7 +3134,13 @@ void LLVOAvatar::addNameTagLine(const std::string& line, const LLColor4& color,
{
mNameText->addLine(line, color, (LLFontGL::StyleFlags)style, font);
}
mNameIsSet |= !line.empty();
// <FS:Ansariel> Fix nametag not properly updating when display name arrives
//mNameIsSet |= !line.empty();
if (is_name)
{
mNameIsSet |= !line.empty();
}
// </FS:Ansariel>
}
void LLVOAvatar::clearNameTag()
@ -4725,7 +4736,7 @@ void LLVOAvatar::updateTextures()
const EBakedTextureIndex baked_index = texture_dict->mBakedTextureIndex;
if (texture_dict->mIsLocalTexture)
{
addLocalTextureStats((ETextureIndex)texture_index, imagep, texel_area_ratio, render_avatar, layer_baked[baked_index]);
addLocalTextureStats((ETextureIndex)texture_index, imagep, texel_area_ratio, render_avatar, mBakedTextureDatas[baked_index].mIsUsed);
}
}
}
@ -4832,7 +4843,6 @@ void LLVOAvatar::addBakedTextureStats( LLViewerFetchedTexture* imagep, F32 pixel
//the texture pipeline will stop fetching this texture.
imagep->resetTextureStats();
// <FS:TM> This we never want to do for OpenSim. Keep as true when LL changes this.
imagep->setMaxVirtualSizeResetInterval(MAX_TEXTURE_VIRTURE_SIZE_RESET_INTERVAL);
imagep->resetMaxVirtualSizeResetCounter() ;

5
indra/newview/llvoavatar.h
View File

@ -258,7 +258,10 @@ public:
static void invalidateNameTag(const LLUUID& agent_id);
// force all name tags to rebuild, useful when display names turned on/off
static void invalidateNameTags();
void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font);
// <FS:Ansariel> Fix nametag not properly updating when display name arrives
//void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font);
void addNameTagLine(const std::string& line, const LLColor4& color, S32 style, const LLFontGL* font, bool is_name = false);
// </FS:Ansariel>
void idleUpdateRenderCost();
void idleUpdateBelowWater();

13
indra/newview/skins/Latency/xui/en/panel_profile_secondlife.xml
View File

@ -319,19 +319,6 @@ KC: Use view_border's around text_editor's due to text render issues with border
name="partner_text"
max_length="254" />
<button
top_pad="-18"
left="30"
height="18"
width="30"
layout="topleft"
follows="left|top"
name="bigimg"
halign="center"
label="&lt; &lt;"
label_selected="&gt;&gt;"
tool_tip="Open Full Size." />
<text
top_pad="8"
left="6"

36
indra/newview/skins/Latency/xui/en/panel_toolbar_view.xml
View File

@ -517,29 +517,19 @@
is_toggle="true"
>
</button>
<!-- FIX There is a problem here -->
<!-- <nearby_voice_monitor name="nearby_voice_output_monitor"
draw_border="false"
tool_tip="Current voice channel activity"
label=""
height="20"
top="2"
left_pad="38"
layout="topleft"
follows="bottom|left"
auto_update="true"
width="40" /> -->
<!-- <nearby_voice_monitor
name="nearby_voice_output_monitor"
draw_border="false"
label=""
height="20"
top="2"
right="0"
layout="topleft"
follows="top|right"
auto_update="true"
width="35" /> -->
<nearby_voice_monitor
name="nearby_voice_output_monitor"
tool_tip="Current voice channel activity"
label=""
top="2"
left_pad="38"
height="20"
width="35"
follows="top|right"
layout="topleft"
auto_update="true"
draw_border="false"
/>
<!-- Do we need this button? -Zi -->
<!--
<button name="utility_show_voice_channel_button"

16
indra/newview/skins/Latency/xui/en/widgets/folder_view_item.xml Normal file
View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<folder_view_item
folder_arrow_image="Folder_Arrow"
folder_indentation="8"
item_height="20"
item_top_pad="3"
selection_image="Rounded_Square"
mouse_opaque="true"
follows="left|top|right"
left_pad="5"
icon_pad="2"
icon_width="16"
text_pad="1"
text_pad_right="4"
arrow_size="12"
max_folder_item_overlap="2"/>