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

storm-1843: remove unused ParcelMediaURLFilter capability

master
Oz Linden 2012-04-16 22:01:27 -04:00
parent b187aeb8f1
commit 5b80b00dcd
3 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
indra/newview/llviewerparcelmgr.cpp
View File

@ -1662,9 +1662,6 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
// Request access list information for this land
parcel_mgr.sendParcelAccessListRequest(AL_ACCESS | AL_BAN);
// Request the media url filter list for this land
parcel_mgr.requestParcelMediaURLFilter();
// Request dwell for this land, if it's not public land.
parcel_mgr.mSelectedDwell = DWELL_NAN;
if (0 != local_id)
@ -1993,67 +1990,6 @@ void LLViewerParcelMgr::sendParcelAccessListUpdate(U32 which)
}
}
class LLParcelMediaURLFilterResponder : public LLHTTPClient::Responder
{
virtual void result(const LLSD& content)
{
LLViewerParcelMgr::getInstance()->receiveParcelMediaURLFilter(content);
}
};
void LLViewerParcelMgr::requestParcelMediaURLFilter()
{
if (!mSelected)
{
return;
}
LLViewerRegion* region = LLWorld::getInstance()->getRegionFromPosGlobal( mWestSouth );
if (!region)
{
return;
}
LLParcel* parcel = mCurrentParcel;
if (!parcel)
{
llwarns << "no parcel" << llendl;
return;
}
LLSD body;
body["local-id"] = parcel->getLocalID();
body["list"] = parcel->getMediaURLFilterList();
std::string url = region->getCapability("ParcelMediaURLFilterList");
if (!url.empty())
{
LLHTTPClient::post(url, body, new LLParcelMediaURLFilterResponder);
}
else
{
llwarns << "can't get ParcelMediaURLFilterList cap" << llendl;
}
}
void LLViewerParcelMgr::receiveParcelMediaURLFilter(const LLSD &content)
{
if (content.has("list"))
{
LLParcel* parcel = LLViewerParcelMgr::getInstance()->mCurrentParcel;
if (!parcel) return;
if (content["local-id"].asInteger() == parcel->getLocalID())
{
parcel->setMediaURLFilterList(content["list"]);
LLViewerParcelMgr::getInstance()->notifyObservers();
}
}
}
void LLViewerParcelMgr::deedLandToGroup()
{
std::string group_name;

5
indra/newview/llviewerparcelmgr.h
View File

@ -223,11 +223,6 @@ public:
// Takes an Access List flag, like AL_ACCESS or AL_BAN
void sendParcelAccessListRequest(U32 flags);
// asks for the parcel's media url filter list
void requestParcelMediaURLFilter();
// receive the response
void receiveParcelMediaURLFilter(const LLSD &content);
// Dwell is not part of the usual parcel update information because the
// simulator doesn't actually know the per-parcel dwell. Ack! We have
// to get it out of the database.

1
indra/newview/llviewerregion.cpp
View File

@ -1522,7 +1522,6 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames)
capabilityNames.append("MeshUploadFlag");
capabilityNames.append("NewFileAgentInventory");
capabilityNames.append("ParcelPropertiesUpdate");
capabilityNames.append("ParcelMediaURLFilterList");
capabilityNames.append("ParcelNavigateMedia");
capabilityNames.append("ParcelVoiceInfoRequest");
capabilityNames.append("ProductInfoRequest");