summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterscriptlimits.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-12-04 09:14:58 -0500
committerOz Linden <oz@lindenlab.com>2010-12-04 09:14:58 -0500
commitefa42a6aab6d3ada198072c0e2be2b7d9b4e1eb5 (patch)
tree39a949e1570c3524c8560522b693328fc7d9afbf /indra/newview/llfloaterscriptlimits.h
parenteed7b7201188e01a452c7f4c511c0cb157dc7a5f (diff)
parent7549df0eaf347e9f490f9cfaf4950dd623a08237 (diff)
merge up to viewer-development
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.h')
-rw-r--r--indra/newview/llfloaterscriptlimits.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
index 46e2e6f0e2..9bcfa5fe14 100644
--- a/indra/newview/llfloaterscriptlimits.h
+++ b/indra/newview/llfloaterscriptlimits.h
@@ -164,10 +164,8 @@ public:
void returnObjects();
private:
-
void onNameCache(const LLUUID& id,
- const std::string& first_name,
- const std::string& last_name);
+ const std::string& name);
LLSD mContent;
LLUUID mParcelId;