MAINT-5488 ADD FIX [Experience Tools] Opening an experience compiled script in an object in an adjacent region fails to show the script is compiled with an experience in the script editor.

This change is needed for related MAINT-5470

1 files changed, 15 insertions, 3 deletions

diff --git a/indra/newview/llexperienceassociationresponder.cpp b/indra/newview/llexperienceassociationresponder.cpp
index 7f2363aadc..f62ca7d75f 100644
--- a/indra/newview/llexperienceassociationresponder.cpp
+++ b/indra/newview/llexperienceassociationresponder.cpp
@@ -51,10 +51,18 @@ void ExperienceAssociationResponder::fetchAssociatedExperience(LLSD& request, ca
     LLViewerObject* object = gObjectList.findObject(request["object-id"]);
     if (!object)
     {
-        LL_WARNS() << "Failed to find object with ID " << request["object-id"] << " in fetchAssociatedExperience" << LL_ENDL;
-        return;
+        LL_DEBUGS() << "Object with ID " << request["object-id"] << " not found via gObjectList.findObject() in fetchAssociatedExperience" << LL_ENDL;
+        LL_DEBUGS() << "Using gAgent.getRegion() instead of object->getRegion()" << LL_ENDL;
+    }
+    LLViewerRegion* region = NULL;
+    if (object)
+    {
+        region = object->getRegion();
+    }
+    else
+    {
+        region = gAgent.getRegion();
     }
-    LLViewerRegion* region = object->getRegion();
     if (region)
     {
         std::string lookup_url=region->getCapability("GetMetadata"); 
@@ -66,6 +74,10 @@ void ExperienceAssociationResponder::fetchAssociatedExperience(LLSD& request, ca
             LLHTTPClient::post(lookup_url, request, new ExperienceAssociationResponder(callback));
         }
     }
+    else
+    {
+        LL_WARNS() << "Failed to lookup region in fetchAssociatedExperience. Fetch request not sent." << LL_ENDL;
+    }
 }
 
 void ExperienceAssociationResponder::httpFailure()