diff options
| author | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-07-12 10:56:23 -0700 |
| commit | c6c7c7c71da48b60557dbc4b653398dd6343b6fc (patch) | |
| tree | 6711858f93cb0353d44568c4531ba8392990cea2 /indra/newview/lltexturefetch.h | |
| parent | 07185d300d7879fc4d8d268210fa2c440efe02f4 (diff) | |
| parent | 83cda57b10e1416f2d104941f862f598653c42cb (diff) | |
Automated merge with tip of viewer64
Diffstat (limited to 'indra/newview/lltexturefetch.h')
| -rw-r--r-- | indra/newview/lltexturefetch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h index 072e6a3307..cfa312ccd9 100644 --- a/indra/newview/lltexturefetch.h +++ b/indra/newview/lltexturefetch.h @@ -160,7 +160,7 @@ public: void commandSendMetrics(const std::string & caps_url, const LLUUID & session_id, const LLUUID & agent_id, - LLViewerAssetStats * main_stats); + LLSD& stats_sd); // Threads: T* void commandDataBreak(); |