diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-07-15 14:17:51 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-07-15 14:17:51 -0500 |
| commit | 93ea3d2850067c23ff07f0ffb362b73247840e9a (patch) | |
| tree | 05b1bd136b33f1f9b2d70ce2d199f5c61d587991 /indra/newview/llfloatersnapshot.cpp | |
| parent | 13202e744c35f0c6154cd0b582b1834896cacb79 (diff) | |
Merge cleanup.
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 187a5e2040..43ea6143b1 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -999,7 +999,7 @@ void LLSnapshotLivePreview::saveTexture() void *userdata = NULL; upload_new_resource(tid, // tid LLAssetType::AT_TEXTURE, - snapname, + "Snapshot : " + pos_string, "Taken by " + who_took_it + " at " + pos_string, 0, LLFolderType::FT_SNAPSHOT_CATEGORY, @@ -1007,7 +1007,7 @@ void LLSnapshotLivePreview::saveTexture() PERM_ALL, // Note: Snapshots to inventory is a special case of content upload PERM_NONE, // that ignores the user's premissions preferences and continues to PERM_NONE, // always use these fairly permissive hard-coded initial perms. - MG - snapname, + "Snapshot : " + pos_string, callback, expected_upload_cost, userdata); gViewerWindow->playSnapshotAnimAndSound(); } |