diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp
index 73c2542087..a9c83861b4 100644
--- a/indra/newview/fsdata.cpp
+++ b/indra/newview/fsdata.cpp
@@ -368,6 +368,7 @@ void FSData::downloadAgents()
         // TODO: Let the opensim devs and opensim group figure out the best way
         // to add "agents.xml" URL to the gridinfo protocol.
         //getAgentsURL();
+        mAgentsDone = true; // Avoid +15s llstartup STATE_AGENT_WAIT delay --ht
 
         // there is no need for assets.xml URL for opensim grids as the grid owner can just delete
         // the bad asset itself.