allow for SnapshotReview dialog to be up during a change of href for all

media capture

interface/src/Application.cpp

@@ -5450,10 +5450,10 @@ void Application::takeSnapshot(bool notify, bool includeAnimated, float aspectRa
         }
     });
 }
-void Application::shareSnapshot(const QString& path) {
+void Application::shareSnapshot(const QString& path, const QUrl& href) {
-    postLambdaEvent([path] {
+    postLambdaEvent([path, href] {
         // not much to do here, everything is done in snapshot code...
-        Snapshot::uploadSnapshot(path);
+        Snapshot::uploadSnapshot(path, href);
     });
 }
 

interface/src/Application.h

@@ -267,7 +267,7 @@ public:
     float getAverageSimsPerSecond() const { return _simCounter.rate(); }
     
     void takeSnapshot(bool notify, bool includeAnimated = false, float aspectRatio = 0.0f);
-    void shareSnapshot(const QString& filename);
+    void shareSnapshot(const QString& filename, const QUrl& href = QUrl(""));
 
     model::SkyboxPointer getDefaultSkybox() const { return _defaultSkybox; }
     gpu::TexturePointer getDefaultSkyboxTexture() const { return _defaultSkyboxTexture;  }

interface/src/scripting/WindowScriptingInterface.cpp

@@ -203,8 +203,8 @@ void WindowScriptingInterface::takeSnapshot(bool notify, bool includeAnimated, f
     qApp->takeSnapshot(notify, includeAnimated, aspectRatio);
 }
 
-void WindowScriptingInterface::shareSnapshot(const QString& path) {
+void WindowScriptingInterface::shareSnapshot(const QString& path, const QUrl& href) {
-    qApp->shareSnapshot(path);
+    qApp->shareSnapshot(path, href);
 }
 
 bool WindowScriptingInterface::isPhysicsEnabled() {

interface/src/scripting/WindowScriptingInterface.h

@@ -53,7 +53,7 @@ public slots:
     void showAssetServer(const QString& upload = "");
     void copyToClipboard(const QString& text);
     void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f);
-    void shareSnapshot(const QString& path);
+    void shareSnapshot(const QString& path, const QUrl& href = QUrl(""));
     bool isPhysicsEnabled();
 
 signals:

interface/src/ui/Snapshot.cpp

@@ -151,13 +151,17 @@ QFile* Snapshot::savedFileForSnapshot(QImage & shot, bool isTemporary) {
     return imageTempFile;
 }
 
-void Snapshot::uploadSnapshot(const QString& filename) {
+void Snapshot::uploadSnapshot(const QString& filename, const QUrl& href) {
 
     const QString SNAPSHOT_UPLOAD_URL = "/api/v1/snapshots";
-    // Alternatively to parseSnapshotData, we could pass the inWorldLocation through the call chain. This way is less disruptive to existing code.
+    SnapshotUploader* uploader;
+    if (href.isEmpty()) {
         SnapshotMetaData* snapshotData = Snapshot::parseSnapshotData(filename);
-    SnapshotUploader* uploader = new SnapshotUploader(snapshotData->getURL(), filename);
+        uploader = new SnapshotUploader(snapshotData->getURL(), filename);
         delete snapshotData;
+    } else {
+        uploader = new SnapshotUploader(href, filename);
+    }
     
     QFile* file = new QFile(filename);
     Q_ASSERT(file->exists());

interface/src/ui/Snapshot.h

@@ -39,7 +39,7 @@ public:
     static SnapshotMetaData* parseSnapshotData(QString snapshotPath);
 
     static Setting::Handle<QString> snapshotsLocation;
-    static void uploadSnapshot(const QString& filename);
+    static void uploadSnapshot(const QString& filename, const QUrl& href = QUrl(""));
 private:
     static QFile* savedFileForSnapshot(QImage & image, bool isTemporary);
 };

scripts/system/snapshot.js

@@ -71,7 +71,7 @@ function confirmShare(data) {
                     if (submessage.share) {
                         print('sharing', submessage.localPath);
                         outstanding++;
-                        Window.shareSnapshot(submessage.localPath);
+                        Window.shareSnapshot(submessage.localPath, submessage.href);
                     } else {
                         print('not sharing', submessage.localPath);
                     }
@@ -159,10 +159,14 @@ function resetButtons(pathStillSnapshot, pathAnimatedSnapshot, notify) {
     button.writeProperty("hoverState", 3);
     Window.snapshotTaken.disconnect(resetButtons);
 
+    // A Snapshot Review dialog might be left open indefinitely after taking the picture,
+    // during which time the user may have moved. So stash that info in the dialog so that
+    // it records the correct href. (We can also stash in .jpegs, but not .gifs.)
+    var href = location.href;
     // last element in data array tells dialog whether we can share or not
     confirmShare([ 
-        { localPath: pathAnimatedSnapshot },
+        { localPath: pathAnimatedSnapshot, href: href },
-        { localPath: pathStillSnapshot },
+        { localPath: pathStillSnapshot, href: href },
         {
             canShare: !!isDomainOpen(location.domainId),
             openFeedAfterShare: shouldOpenFeedAfterShare()