summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterscriptlimits.h
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2015-07-10 19:46:51 -0400
committerNat Goodspeed <nat@lindenlab.com>2015-07-10 19:46:51 -0400
commitd215de3b7d672dcb5da41600c2b5d0abe2cb82ce (patch)
treeeb12d68e18684eb5dd6f4cb309c039f5bc52ed11 /indra/newview/llfloaterscriptlimits.h
parent91f636f23a6db27c4ca4c5df2325a7053ca3044e (diff)
parent68f42e4e102bd578386aeec3485233e332cbdcff (diff)
Automated merge with ssh://bitbucket.org/rider_linden/maint-4952-v-t-u
Diffstat (limited to 'indra/newview/llfloaterscriptlimits.h')
-rwxr-xr-xindra/newview/llfloaterscriptlimits.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llfloaterscriptlimits.h b/indra/newview/llfloaterscriptlimits.h
index 030020087b..e3cbbd185f 100755
--- a/indra/newview/llfloaterscriptlimits.h
+++ b/indra/newview/llfloaterscriptlimits.h
@@ -132,9 +132,9 @@ private:
std::vector<LLSD> mObjectListItems;
- void getLandScriptResourcesCoro(LLCoros::self& self, std::string url);
- void getLandScriptSummaryCoro(LLCoros::self& self, std::string url);
- void getLandScriptDetailsCoro(LLCoros::self& self, std::string url);
+ void getLandScriptResourcesCoro(std::string url);
+ void getLandScriptSummaryCoro(std::string url);
+ void getLandScriptDetailsCoro(std::string url);
protected:
@@ -180,7 +180,7 @@ public:
void clearList();
private:
- void getAttachmentLimitsCoro(LLCoros::self& self, std::string url);
+ void getAttachmentLimitsCoro(std::string url);
bool mGotAttachmentMemoryUsed;
S32 mAttachmentMemoryMax;