diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 11:10:13 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-02-23 11:10:13 -0700 |
| commit | bfa25219b899636db74bedc258bc763caf91ddf0 (patch) | |
| tree | d9d82b63d9d5d3d784b4bee852f9caed2c897a71 /indra/newview/llfloaterscriptlimits.h | |
| parent | bcb5b209d1813681202524362dd186c8b0982357 (diff) | |
| parent | 01cdeb0cdd8c48b76a229d42ced4e5563cd18c5c (diff) | |
Automated merge with ssh://hg.lindenlab.com/bao/private-memory-pool
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; |