diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-10-20 12:18:33 -0400 |
| commit | 76876538715e3afbe456e2bf84173bde416d50e6 (patch) | |
| tree | 423b27e9a5ef5c463b066b0fb5a50bda25060869 /indra/newview/llfloaterscriptlimits.h | |
| parent | 0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff) | |
| parent | 04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.h')
| -rw-r--r-- | indra/newview/llfloaterscriptlimits.h | 4 |
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; |