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

Radar Parcel/Estate Context Menu options and Controls, adapted from Kitty Barnett / Catznip 

Catznip Branch UI-SidepanelPeople, changesets:
b357a45d57122ec40e9abd9d25c19ffebb601926
d56e5290381fa183631d9284e4047c6c3273e25d
7d095c19edaf2d6ebcdf94d1302a45ee9f31ee04
Arrehn 2011-05-31 16:43:54 -04:00
parent 5062b2e73f
commit f5d3164376
9 changed files with 722 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

457
indra/newview/llavataractions.cpp
View File

@ -72,6 +72,10 @@
#include "llslurl.h" // IDEVO
#include "llviewercontrol.h"
#include "llfloaterreporter.h"
#include "llparcel.h"
#include "llviewerparcelmgr.h"
#include "llvoavatar.h"
#include "llworld.h"
#include "llviewermenu.h"
// static
@ -996,12 +1000,461 @@ bool LLAvatarActions::canBlock(const LLUUID& id)
return !is_self && !is_linden;
}
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-12-03 (Catznip-2.4.0g) | Modified: Catznip-2.4.0g
void LLAvatarActions::report(const LLUUID& idAgent)
{
LLAvatarName avName;
LLAvatarNameCache::get(idAgent, &avName);
LLFloaterReporter::showFromAvatar(idAgent, avName.getCompleteName());
}
bool LLAvatarActions::canZoomIn(const LLUUID& idAgent)
{
return gObjectList.findObject(idAgent);
return gObjectList.findObject(idAgent);
}
void LLAvatarActions::zoomIn(const LLUUID& idAgent)
{
handle_zoom_to_object(idAgent);
handle_zoom_to_object(idAgent);
}
//
// Parcel actions
//
// Defined in llworld.cpp
LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin);
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool getRegionAndPosGlobalFromAgentID(const LLUUID& idAgent, const LLViewerRegion** ppRegion, LLVector3d* pPosGlobal)
{
// Try looking up the agent in gObjectList
const LLViewerObject* pAvatarObj = gObjectList.findObject(idAgent);
if (pAvatarObj)
{
if (ppRegion)
*ppRegion = pAvatarObj->getRegion();
if (pPosGlobal)
*pPosGlobal = pAvatarObj->getPositionGlobal();
return (pAvatarObj->isAvatar()) && (NULL != pAvatarObj->getRegion());
}
// Walk over each region we're connected to and try finding the agent on one of them
LLWorld::region_list_t::const_iterator itRegion = LLWorld::getInstance()->getRegionList().begin();
LLWorld::region_list_t::const_iterator endRegion = LLWorld::getInstance()->getRegionList().end();
for (; itRegion != endRegion; ++itRegion)
{
const LLViewerRegion* pRegion = *itRegion;
for (S32 idxRegionAgent = 0, cntRegionAgent = pRegion->mMapAvatars.count(); idxRegionAgent < cntRegionAgent; idxRegionAgent++)
{
if (pRegion->mMapAvatarIDs.get(idxRegionAgent) == idAgent)
{
if (ppRegion)
*ppRegion = pRegion;
if (pPosGlobal)
*pPosGlobal = unpackLocalToGlobalPosition(pRegion->mMapAvatars.get(idxRegionAgent), pRegion->getOriginGlobal());
return (NULL != pRegion);
}
}
}
// Couldn't find the agent anywhere
return false;
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
inline bool getRegionFromAgentID(const LLUUID& idAgent, const LLViewerRegion** ppRegion)
{
return getRegionAndPosGlobalFromAgentID(idAgent, ppRegion, NULL);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
inline bool getPosGlobalFromAgentID(const LLUUID& idAgent, LLVector3d& posGlobal)
{
return getRegionAndPosGlobalFromAgentID(idAgent, NULL, &posGlobal);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::canLandFreezeOrEject(const LLUUID& idAgent)
{
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
return canEstateKickOrTeleportHomeMultiple(idAgents);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::canLandFreezeOrEjectMultiple(uuid_vec_t& idAgents, bool fFilter /*=false*/)
{
if (gAgent.isGodlikeWithoutAdminMenuFakery())
return true; // Gods can always freeze
uuid_vec_t::iterator itAgent = idAgents.begin(); bool fCanFreeze = false;
while ( (itAgent != idAgents.end()) && ((fFilter) || (!fCanFreeze)) )
{
const LLViewerRegion* pRegion = NULL; LLVector3d posGlobal;
if (getRegionAndPosGlobalFromAgentID(*itAgent, &pRegion, &posGlobal))
{
// NOTE: we actually don't always need the parcel, but attempting to get it now will help with setting fBanEnabled when ejecting
const LLParcel* pParcel = LLViewerParcelMgr::getInstance()->selectParcelAt(posGlobal)->getParcel();
const LLVector3 posRegion = pRegion->getPosRegionFromGlobal(posGlobal);
if ( (pRegion->getOwner() == gAgent.getID()) || (pRegion->isEstateManager()) || (pRegion->isOwnedSelf(posRegion)) ||
((pRegion->isOwnedGroup(posRegion)) && (pParcel) && (gAgent.hasPowerInGroup(pParcel->getOwnerID(), GP_LAND_ADMIN))) )
{
fCanFreeze = true;
++itAgent;
continue;
}
}
if (fFilter)
itAgent = idAgents.erase(itAgent);
else
++itAgent;
}
return fCanFreeze;
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::landEject(const LLUUID& idAgent)
{
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
landEjectMultiple(idAgents);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::landEjectMultiple(const uuid_vec_t& idAgents)
{
uuid_vec_t idEjectAgents(idAgents);
if (!canLandFreezeOrEjectMultiple(idEjectAgents, true))
return;
LLSD args, payload; std::string strMsgName, strResidents; bool fBanEnabled = false;
for (uuid_vec_t::const_iterator itAgent = idEjectAgents.begin(); itAgent != idEjectAgents.end(); ++itAgent)
{
const LLUUID& idAgent = *itAgent; LLVector3d posGlobal;
if ( (!fBanEnabled) && (getPosGlobalFromAgentID(idAgent, posGlobal)) )
{
const LLParcel* pParcel = LLViewerParcelMgr::getInstance()->selectParcelAt(posGlobal)->getParcel();
fBanEnabled = (pParcel) && (LLViewerParcelMgr::getInstance()->isParcelOwnedByAgent(pParcel, GP_LAND_MANAGE_BANNED));
}
if (idEjectAgents.begin() != itAgent)
strResidents += "\n";
strResidents += LLSLURL("agent", idAgent, "completename").getSLURLString();
payload["ids"].append(*itAgent);
}
if (1 == payload["ids"].size())
{
args["AVATAR_NAME"] = strResidents;
strMsgName = (fBanEnabled) ? "EjectAvatarFullname" : "EjectAvatarFullnameNoBan";
}
else
{
args["RESIDENTS"] = strResidents;
strMsgName = (fBanEnabled) ? "EjectAvatarMultiple" : "EjectAvatarMultipleNoBan";
}
payload["ban_enabled"] = fBanEnabled;
LLNotificationsUtil::add(strMsgName, args, payload, &callbackLandEject);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::callbackLandEject(const LLSD& notification, const LLSD& response)
{
S32 idxOption = LLNotificationsUtil::getSelectedOption(notification, response);
if (2 == idxOption) // Cancel button.
return false;
bool fBanEnabled = notification["payload"]["ban_enabled"].asBoolean();
if ( (0 == idxOption) || (fBanEnabled) ) // Eject button (or Eject + Ban)
{
const LLSD& idAgents = notification["payload"]["ids"];
for (LLSD::array_const_iterator itAgent = idAgents.beginArray(); itAgent != idAgents.endArray(); ++itAgent)
{
const LLUUID idAgent = itAgent->asUUID(); const LLViewerRegion* pAgentRegion = NULL;
if (getRegionFromAgentID(idAgent, &pAgentRegion))
{
// This is tricky. It is similar to say if it is not an 'Eject' button, and it is also not an 'Cancel' button,
// and ban_enabled==true, it should be the 'Eject and Ban' button.
U32 flags = ( (0 != idxOption) && (fBanEnabled) ) ? 0x1 : 0x0;
gMessageSystem->newMessage("EjectUser");
gMessageSystem->nextBlock("AgentData");
gMessageSystem->addUUID("AgentID", gAgent.getID());
gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
gMessageSystem->nextBlock("Data");
gMessageSystem->addUUID("TargetID", idAgent);
gMessageSystem->addU32("Flags", flags);
gMessageSystem->sendReliable(pAgentRegion->getHost());
}
}
}
return false;
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::landFreeze(const LLUUID& idAgent)
{
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
landFreezeMultiple(idAgents);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::landFreezeMultiple(const uuid_vec_t& idAgents)
{
uuid_vec_t idEjectAgents(idAgents);
if (!canLandFreezeOrEjectMultiple(idEjectAgents, true))
return;
LLSD args, payload; std::string strMsgName, strResidents;
for (uuid_vec_t::const_iterator itAgent = idEjectAgents.begin(); itAgent != idEjectAgents.end(); ++itAgent)
{
const LLUUID& idAgent = *itAgent;
if (idEjectAgents.begin() != itAgent)
strResidents += "\n";
strResidents += LLSLURL("agent", idAgent, "completename").getSLURLString();
payload["ids"].append(*itAgent);
}
if (1 == payload["ids"].size())
{
args["AVATAR_NAME"] = strResidents;
strMsgName = "FreezeAvatarFullname";
}
else
{
args["RESIDENTS"] = strResidents;
strMsgName = "FreezeAvatarMultiple";
}
LLNotificationsUtil::add(strMsgName, args, payload, &callbackLandFreeze);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::callbackLandFreeze(const LLSD& notification, const LLSD& response)
{
S32 idxOption = LLNotificationsUtil::getSelectedOption(notification, response);
if ( (0 == idxOption) || (1 == idxOption) )
{
U32 flags = (0 == idxOption) ? 0x0 : 0x1;
const LLSD& idAgents = notification["payload"]["ids"];
for (LLSD::array_const_iterator itAgent = idAgents.beginArray(); itAgent != idAgents.endArray(); ++itAgent)
{
const LLUUID idAgent = itAgent->asUUID(); const LLViewerRegion* pAgentRegion = NULL;
if (getRegionFromAgentID(idAgent, &pAgentRegion))
{
gMessageSystem->newMessage("FreezeUser");
gMessageSystem->nextBlock("AgentData");
gMessageSystem->addUUID("AgentID", gAgent.getID());
gMessageSystem->addUUID("SessionID", gAgent.getSessionID());
gMessageSystem->nextBlock("Data");
gMessageSystem->addUUID("TargetID", idAgent);
gMessageSystem->addU32("Flags", flags);
gMessageSystem->sendReliable(pAgentRegion->getHost());
}
}
}
return false;
}
//
// Estate actions
//
typedef std::vector<std::string> strings_t;
// Copy/paste from LLPanelRegionInfo::sendEstateOwnerMessage
void sendEstateOwnerMessage(const LLViewerRegion* pRegion, const std::string& request, const LLUUID& invoice, const strings_t& strings)
{
if (pRegion)
{
llinfos << "Sending estate request '" << request << "'" << llendl;
gMessageSystem->newMessage("EstateOwnerMessage");
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
gMessageSystem->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
gMessageSystem->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
gMessageSystem->nextBlock("MethodData");
gMessageSystem->addString("Method", request);
gMessageSystem->addUUID("Invoice", invoice);
if(strings.empty())
{
gMessageSystem->nextBlock("ParamList");
gMessageSystem->addString("Parameter", NULL);
}
else
{
strings_t::const_iterator it = strings.begin();
strings_t::const_iterator end = strings.end();
for(; it != end; ++it)
{
gMessageSystem->nextBlock("ParamList");
gMessageSystem->addString("Parameter", *it);
}
}
gMessageSystem->sendReliable(pRegion->getHost());
}
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::canEstateKickOrTeleportHome(const LLUUID& idAgent)
{
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
return canLandFreezeOrEjectMultiple(idAgents);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::canEstateKickOrTeleportHomeMultiple(uuid_vec_t& idAgents, bool fFilter /*=false*/)
{
if (gAgent.isGodlikeWithoutAdminMenuFakery())
return true; // Gods can always kick
uuid_vec_t::iterator itAgent = idAgents.begin(); bool fCanKick = false;
while ( (itAgent != idAgents.end()) && ((fFilter) || (!fCanKick)) )
{
const LLViewerRegion* pRegion = NULL;
if ( (getRegionFromAgentID(*itAgent, &pRegion)) && ((pRegion->getOwner() == gAgent.getID()) || (pRegion->isEstateManager())) )
{
fCanKick = true;
++itAgent; // Estate owners/managers can kick
continue;
}
if (fFilter)
itAgent = idAgents.erase(itAgent);
else
++itAgent;
}
return fCanKick;
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::estateKick(const LLUUID& idAgent)
{
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
estateKickMultiple(idAgents);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::estateKickMultiple(const uuid_vec_t& idAgents)
{
uuid_vec_t idEjectAgents(idAgents);
if (!canEstateKickOrTeleportHomeMultiple(idEjectAgents, true))
return;
LLSD args, payload; std::string strMsgName, strResidents;
for (uuid_vec_t::const_iterator itAgent = idEjectAgents.begin(); itAgent != idEjectAgents.end(); ++itAgent)
{
const LLUUID& idAgent = *itAgent;
if (idEjectAgents.begin() != itAgent)
strResidents += "\n";
strResidents += LLSLURL("agent", idAgent, "completename").getSLURLString();
payload["ids"].append(*itAgent);
}
if (1 == payload["ids"].size())
{
args["EVIL_USER"] = strResidents;
strMsgName = "EstateKickUser";
}
else
{
args["RESIDENTS"] = strResidents;
strMsgName = "EstateKickMultiple";
}
LLNotificationsUtil::add(strMsgName, args, payload, &callbackEstateKick);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::callbackEstateKick(const LLSD& notification, const LLSD& response)
{
S32 idxOption = LLNotificationsUtil::getSelectedOption(notification, response);
if (0 == idxOption)
{
const LLSD& idAgents = notification["payload"]["ids"];
for (LLSD::array_const_iterator itAgent = idAgents.beginArray(); itAgent != idAgents.endArray(); ++itAgent)
{
const LLViewerRegion* pRegion = NULL;
if (getRegionFromAgentID(itAgent->asUUID(), &pRegion))
{
strings_t strings;
strings.push_back(itAgent->asString());
sendEstateOwnerMessage(pRegion, "kickestate", LLUUID::generateNewID(), strings);
}
}
}
return false;
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::estateTeleportHome(const LLUUID& idAgent)
{
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
estateTeleportHomeMultiple(idAgents);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::estateTeleportHomeMultiple(const uuid_vec_t& idAgents)
{
uuid_vec_t idEjectAgents(idAgents);
if (!canEstateKickOrTeleportHomeMultiple(idEjectAgents, true))
return;
LLSD args, payload; std::string strMsgName, strResidents;
for (uuid_vec_t::const_iterator itAgent = idEjectAgents.begin(); itAgent != idEjectAgents.end(); ++itAgent)
{
const LLUUID& idAgent = *itAgent;
if (idEjectAgents.begin() != itAgent)
strResidents += "\n";
strResidents += LLSLURL("agent", idAgent, "completename").getSLURLString();
payload["ids"].append(*itAgent);
}
if (1 == payload["ids"].size())
{
args["AVATAR_NAME"] = strResidents;
strMsgName = "EstateTeleportHomeUser";
}
else
{
args["RESIDENTS"] = strResidents;
strMsgName = "EstateTeleportHomeMultiple";
}
LLNotificationsUtil::add(strMsgName, args, payload, &callbackEstateTeleportHome);
}
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
bool LLAvatarActions::callbackEstateTeleportHome(const LLSD& notification, const LLSD& response)
{
S32 idxOption = LLNotificationsUtil::getSelectedOption(notification, response);
if (0 == idxOption)
{
const LLSD& idAgents = notification["payload"]["ids"];
for (LLSD::array_const_iterator itAgent = idAgents.beginArray(); itAgent != idAgents.endArray(); ++itAgent)
{
const LLViewerRegion* pRegion = NULL;
if (getRegionFromAgentID(itAgent->asUUID(), &pRegion))
{
strings_t strings;
strings.push_back(gAgent.getID().asString());
strings.push_back(itAgent->asString());
sendEstateOwnerMessage(pRegion, "teleporthomeuser", LLUUID::generateNewID(), strings);
}
}
}
return false;
}
// [/SL:KB]

42
indra/newview/llavataractions.h
View File

@ -193,9 +193,47 @@ public:
* @return false if the selected items cannot be shared or the active inventory panel cannot be obtained
*/
static bool canShareSelectedItems(LLInventoryPanel* inv_panel = NULL);
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-12-02 (Catznip-2.4.0g) | Modified: Catznip-2.4.0g
static void report(const LLUUID& idAgent);
static bool canZoomIn(const LLUUID& idAgent);
static void zoomIn(const LLUUID& idAgent);
static bool canZoomIn(const LLUUID& idAgent);
static void zoomIn(const LLUUID& idAgent);
//
// Parcel actions
//
public:
static bool canLandFreezeOrEject(const LLUUID& idAgent);
static void landEject(const LLUUID& idAgent);
static void landFreeze(const LLUUID& idAgent);
static bool canLandFreezeOrEjectMultiple(uuid_vec_t& idAgents, bool fFilter = false);
static void landEjectMultiple(const uuid_vec_t& idAgents);
static void landFreezeMultiple(const uuid_vec_t& idAgents);
protected:
static bool callbackLandEject(const LLSD& notification, const LLSD& response);
static bool callbackLandFreeze(const LLSD& notification, const LLSD& response);
//
// Estate actions
//
public:
static bool canEstateKickOrTeleportHome(const LLUUID& idAgent);
static void estateKick(const LLUUID& idAgent);
static void estateTeleportHome(const LLUUID& idAgent);
static bool canEstateKickOrTeleportHomeMultiple(uuid_vec_t& idAgents, bool fFilter = false);
static void estateKickMultiple(const uuid_vec_t& idAgents);
static void estateTeleportHomeMultiple(const uuid_vec_t& idAgents);
protected:
static bool callbackEstateKick(const LLSD& notification, const LLSD& response);
static bool callbackEstateTeleportHome(const LLSD& notification, const LLSD& response);
// [/SL:KB]
private:
static bool callbackAddFriendWithMessage(const LLSD& notification, const LLSD& response);

22
indra/newview/llpanelpeoplemenus.cpp
View File

@ -69,6 +69,18 @@ LLContextMenu* NearbyMenu::createMenu()
registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::share, id));
registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, id));
registrar.add("Avatar.BlockUnblock", boost::bind(&LLAvatarActions::toggleBlock, id));
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-12-03 (Catznip-2.4.0g) | Modified: Catznip-2.4.0g
registrar.add("Avatar.ZoomIn", boost::bind(&LLAvatarActions::zoomIn, id));
enable_registrar.add("Avatar.VisibleZoomIn", boost::bind(&LLAvatarActions::canZoomIn, id));
registrar.add("Avatar.Report", boost::bind(&LLAvatarActions::report, id));
registrar.add("Avatar.Eject", boost::bind(&LLAvatarActions::landEject, id));
registrar.add("Avatar.Freeze", boost::bind(&LLAvatarActions::landFreeze, id));
enable_registrar.add("Avatar.VisibleFreezeEject", boost::bind(&LLAvatarActions::canLandFreezeOrEject, id));
registrar.add("Avatar.Kick", boost::bind(&LLAvatarActions::estateKick, id));
registrar.add("Avatar.TeleportHome", boost::bind(&LLAvatarActions::estateTeleportHome, id));
enable_registrar.add("Avatar.VisibleKickTeleportHome", boost::bind(&LLAvatarActions::canEstateKickOrTeleportHome, id));
// [/SL:KB]
registrar.add("Nearby.People.TeleportToAvatar", boost::bind(&NearbyMenu::teleportToAvatar, this));
registrar.add("Avatar.ZoomIn", boost::bind(&LLAvatarActions::zoomIn, id));
@ -91,7 +103,15 @@ LLContextMenu* NearbyMenu::createMenu()
// registrar.add("Avatar.Share", boost::bind(&LLAvatarActions::startIM, mUUIDs)); // *TODO: unimplemented
// registrar.add("Avatar.Pay", boost::bind(&LLAvatarActions::pay, mUUIDs)); // *TODO: unimplemented
enable_registrar.add("Avatar.EnableItem", boost::bind(&NearbyMenu::enableContextMenuItem, this, _2));
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-11-05 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
registrar.add("Avatar.Eject", boost::bind(&LLAvatarActions::landEjectMultiple, mUUIDs));
registrar.add("Avatar.Freeze", boost::bind(&LLAvatarActions::landFreezeMultiple, mUUIDs));
enable_registrar.add("Avatar.VisibleFreezeEject", boost::bind(&LLAvatarActions::canLandFreezeOrEjectMultiple, mUUIDs, false));
registrar.add("Avatar.Kick", boost::bind(&LLAvatarActions::estateKickMultiple, mUUIDs));
registrar.add("Avatar.TeleportHome", boost::bind(&LLAvatarActions::estateTeleportHomeMultiple, mUUIDs));
enable_registrar.add("Avatar.VisibleKickTeleportHome", boost::bind(&LLAvatarActions::canEstateKickOrTeleportHomeMultiple, mUUIDs, false));
// [/SL:KB]
// create the context menu from the XUI
return createFromFile("menu_people_nearby_multiselect.xml");
}

10
indra/newview/llviewerregion.cpp
View File

@ -860,7 +860,10 @@ bool LLViewerRegion::isAlive()
return mAlive;
}
BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
//BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-12-02 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos) const
// [/SL:KB]
{
if (mParcelOverlay)
{
@ -871,7 +874,10 @@ BOOL LLViewerRegion::isOwnedSelf(const LLVector3& pos)
}
// Owned by a group you belong to? (officer or member)
BOOL LLViewerRegion::isOwnedGroup(const LLVector3& pos)
//BOOL LLViewerRegion::isOwnedGroup(const LLVector3& pos)
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-12-02 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
BOOL LLViewerRegion::isOwnedGroup(const LLVector3& pos) const
// [/SL:KB]
{
if (mParcelOverlay)
{

10
indra/newview/llviewerregion.h
View File

@ -263,10 +263,16 @@ public:
LLVLComposition *getComposition() const { return mCompositionp; }
F32 getCompositionXY(const S32 x, const S32 y) const;
BOOL isOwnedSelf(const LLVector3& pos);
// BOOL isOwnedSelf(const LLVector3& pos);
//
// // Owned by a group you belong to? (officer OR member)
// BOOL isOwnedGroup(const LLVector3& pos);
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-12-02 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
BOOL isOwnedSelf(const LLVector3& pos) const;
// Owned by a group you belong to? (officer OR member)
BOOL isOwnedGroup(const LLVector3& pos);
BOOL isOwnedGroup(const LLVector3& pos) const;
// [/SL:KB]
// deal with map object updates in the world.
void updateCoarseLocations(LLMessageSystem* msg);

5
indra/newview/llworld.cpp
View File

@ -1221,7 +1221,10 @@ void send_agent_resume()
LLAppViewer::instance()->resumeMainloopTimeout();
}
static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
//static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
// [SL:KB] - Patch: UI-SidepanelPeople | Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3d& region_origin)
// [/SL:KB]
{
LLVector3d pos_global;
LLVector3 pos_local;

78
indra/newview/skins/default/xui/en/menu_people_nearby.xml
View File

@ -70,19 +70,6 @@
<menu_item_call.on_click
function="Avatar.Pay" />
</menu_item_call>
<menu_item_check
label="Block/Unblock"
layout="topleft"
name="Block/Unblock">
<menu_item_check.on_click
function="Avatar.BlockUnblock" />
<menu_item_check.on_check
function="Avatar.CheckItem"
parameter="is_blocked" />
<menu_item_check.on_enable
function="Avatar.EnableItem"
parameter="can_block" />
</menu_item_check>
<menu_item_call
label="Offer Teleport"
name="teleport">
@ -98,4 +85,69 @@
<menu_item_call.on_click
function="Nearby.People.TeleportToAvatar"/>
</menu_item_call>
<menu_item_call
label="Zoom In"
name="zoom_in">
<menu_item_call.on_click
function="Avatar.ZoomIn"/>
<menu_item_call.on_visible
function="Avatar.VisibleZoomIn"/>
</menu_item_call>
<menu_item_separator />
<menu_item_check
label="Block/Unblock"
layout="topleft"
name="Block/Unblock">
<menu_item_check.on_click
function="Avatar.BlockUnblock" />
<menu_item_check.on_check
function="Avatar.CheckItem"
parameter="is_blocked" />
<menu_item_check.on_enable
function="Avatar.EnableItem"
parameter="can_block" />
</menu_item_check>
<menu_item_call
label="Report"
name="report">
<menu_item_call.on_click
function="Avatar.Report"/>
</menu_item_call>
<menu_item_call
label="Freeze"
name="freeze">
<menu_item_call.on_click
function="Avatar.Freeze"/>
<menu_item_call.on_visible
function="Avatar.VisibleFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Eject"
name="eject">
<menu_item_call.on_click
function="Avatar.Eject"/>
<menu_item_call.on_visible
function="Avatar.VisibleFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Kick"
name="kick">
<menu_item_call.on_click
function="Avatar.Kick"/>
<menu_item_call.on_visible
function="Avatar.VisibleKickTeleportHome"/>
</menu_item_call>
<menu_item_call
label="Teleport Home"
name="teleport_home">
<menu_item_call.on_click
function="Avatar.TeleportHome"/>
<menu_item_call.on_visible
function="Avatar.VisibleKickTeleportHome"/>
</menu_item_call>
</context_menu>

36
indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml
View File

@ -66,4 +66,40 @@
function="Avatar.EnableItem"
parameter="can_offer_teleport"/>
</menu_item_call>
<menu_item_separator />
<menu_item_call
label="Freeze"
name="freeze">
<menu_item_call.on_click
function="Avatar.Freeze"/>
<menu_item_call.on_visible
function="Avatar.VisibleFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Eject"
name="eject">
<menu_item_call.on_click
function="Avatar.Eject"/>
<menu_item_call.on_visible
function="Avatar.VisibleFreezeEject"/>
</menu_item_call>
<menu_item_call
label="Kick"
name="kick">
<menu_item_call.on_click
function="Avatar.Kick"/>
<menu_item_call.on_visible
function="Avatar.VisibleKickTeleportHome"/>
</menu_item_call>
<menu_item_call
label="Teleport Home"
name="teleport_home">
<menu_item_call.on_click
function="Avatar.TeleportHome"/>
<menu_item_call.on_visible
function="Avatar.VisibleKickTeleportHome"/>
</menu_item_call>
</context_menu>

85
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -1198,6 +1198,22 @@ He or she will temporarily be unable to move, chat, or interact with the world.
notext="Unfreeze"
yestext="Freeze"/>
</notification>
<notification
icon="alertmodal.tga"
name="FreezeAvatarMultiple"
type="alertmodal">
Freeze the following avatars?
[RESIDENTS]
They will temporarily be unable to move, chat, or interact with the world.
<usetemplate
canceltext="Cancel"
name="yesnocancelbuttons"
notext="Unfreeze"
yestext="Freeze"/>
</notification>
<notification
icon="alertmodal.tga"
@ -1233,6 +1249,33 @@ Eject [AVATAR_NAME] from your land?
yestext="Eject"/>
</notification>
<notification
icon="alertmodal.tga"
name="EjectAvatarMultiple"
type="alertmodal">
Eject the following avatars from your land?
[RESIDENTS]
<usetemplate
canceltext="Cancel"
name="yesnocancelbuttons"
notext="Eject and Ban"
yestext="Eject"/>
</notification>
<notification
icon="alertmodal.tga"
name="EjectAvatarMultipleNoBan"
type="alertmodal">
Eject the following avatars from your land?
[RESIDENTS]
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="Eject"/>
</notification>
<notification
icon="alertmodal.tga"
name="EjectAvatarFromGroup"
@ -3681,6 +3724,48 @@ Kick [EVIL_USER] from this estate?
yestext="OK"/>
</notification>
<notification
icon="alert.tga"
label="Confirm Kick"
name="EstateKickMultiple"
type="alert">
Kick the following residents from this estate?
[RESIDENTS]
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alert.tga"
label="Confirm Teleport Home"
name="EstateTeleportHomeUser"
type="alert">
Teleport [AVATAR_NAME] home?
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alert.tga"
label="Confirm Teleport Home"
name="EstateTeleportHomeMultiple"
type="alert">
Teleport the following residents home?
[RESIDENTS]
<usetemplate
name="okcancelbuttons"
notext="Cancel"
yestext="OK"/>
</notification>
<notification
icon="alertmodal.tga"
name="EstateChangeCovenant"