diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
| commit | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (patch) | |
| tree | 7c016ab72795543361d206de5344b34a6a823fdf /indra/newview/llfloaterscriptlimits.h | |
| parent | dac53830f1a67c8657ced9c39eccedbadf149bd9 (diff) | |
| parent | 40979589afc5c91cab977307a1e400315b1c8a8f (diff) | |
merge with STORM-105
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; |