summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterscriptlimits.h
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-10-19 13:47:15 -0700
committerDessie Linden <dessie@lindenlab.com>2010-10-19 13:47:15 -0700
commit42e397e155239932a75fa694dc77d9dd952e3c09 (patch)
tree1d3cb00d99a585879facf6dce5b7133dbd8ad6da /indra/newview/llfloaterscriptlimits.h
parenta63b83775120f7ebe3bafb897da70e4e41bda6a4 (diff)
parentc683151587067cb2758206432610d4ff4884036e (diff)
Merged from 2.3.0-beta1 tag in 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;