summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodeluploadbase.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-07-02 09:22:05 -0700
committerRider Linden <rider@lindenlab.com>2015-07-02 09:22:05 -0700
commitd785ec312bb7f4e77517eb44f46f276ba0129677 (patch)
tree9686020c06681328d7150ef6a89d975bd2d418ce /indra/newview/llfloatermodeluploadbase.h
parentf8a7eda55bdd34eeb2fafed21d23d26cd25f924d (diff)
parent2a29dbc48295ad24a8a7137a10b9d891debea978 (diff)
Merge
Diffstat (limited to 'indra/newview/llfloatermodeluploadbase.h')
-rwxr-xr-xindra/newview/llfloatermodeluploadbase.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloatermodeluploadbase.h b/indra/newview/llfloatermodeluploadbase.h
index 9bb9959af0..0d4c834122 100755
--- a/indra/newview/llfloatermodeluploadbase.h
+++ b/indra/newview/llfloatermodeluploadbase.h
@@ -56,7 +56,7 @@ protected:
// requests agent's permissions to upload model
void requestAgentUploadPermissions();
- void requestAgentUploadPermissionsCoro(LLCoros::self& self, std::string url, LLHandle<LLUploadPermissionsObserver> observerHandle);
+ void requestAgentUploadPermissionsCoro(std::string url, LLHandle<LLUploadPermissionsObserver> observerHandle);
std::string mUploadModelUrl;
bool mHasUploadPerm;