summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerparcelmgr.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2012-09-07 14:47:24 -0400
committerNat Goodspeed <nat@lindenlab.com>2012-09-07 14:47:24 -0400
commit695c4135ff6fa0c50daa4c84f23096096ffd8a54 (patch)
treea9b539e3ba588634fc493f2ed5ead21124e306ff /indra/newview/llviewerparcelmgr.h
parentaf6e665d5c9c9a5ea480389c284839f3945bf786 (diff)
parentb6f0921099b9b2a0a582886ebd6383fa20eac2b0 (diff)
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
Diffstat (limited to 'indra/newview/llviewerparcelmgr.h')
-rw-r--r--indra/newview/llviewerparcelmgr.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llviewerparcelmgr.h b/indra/newview/llviewerparcelmgr.h
index 2a11549426..6183b7e90e 100644
--- a/indra/newview/llviewerparcelmgr.h
+++ b/indra/newview/llviewerparcelmgr.h
@@ -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.