Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SH-3065 Out-of-order operations on startup. http://hg.secondlife.com/viewer-beta/changeset/ecdfca07cbe3

Browse Source
This commit is contained in:
Shyotl
2012-06-09 01:57:21 -05:00
parent bb8417d6be
commit 1a217b23c6
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llavatarpropertiesprocessor.cpp
View File

@@ -31,6 +31,7 @@
// Viewer includes // Viewer includes
#include "llagent.h" #include "llagent.h"
#include "llviewergenericmessage.h" #include "llviewergenericmessage.h"
#include "llstartup.h"
// Linden library includes // Linden library includes
#include "llavatarconstants.h" // AVATAR_TRANSACTED, etc. #include "llavatarconstants.h" // AVATAR_TRANSACTED, etc.
@@ -111,6 +112,14 @@ void LLAvatarPropertiesProcessor::sendGenericRequest(const LLUUID& avatar_id, EA
void LLAvatarPropertiesProcessor::sendAvatarPropertiesRequest(const LLUUID& avatar_id) void LLAvatarPropertiesProcessor::sendAvatarPropertiesRequest(const LLUUID& avatar_id)
{ {
// this is the startup state when send_complete_agent_movement() message is sent.
// Before this, the AvatarPropertiesRequest message
// won't work so don't bother trying
if (LLStartUp::getStartupState() <= STATE_AGENT_SEND)
{
return;
}
if (isPendingRequest(avatar_id, APT_PROPERTIES)) if (isPendingRequest(avatar_id, APT_PROPERTIES))
{ {
// waiting for a response, don't re-request // waiting for a response, don't re-request

14
indra/newview/lltexturefetch.cpp
View File

@@ -57,6 +57,7 @@
#include "llviewerregion.h" #include "llviewerregion.h"
#include "llviewerstats.h" #include "llviewerstats.h"
#include "llworld.h" #include "llworld.h"
#include "llstartup.h"
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
class LLTextureFetchWorker : public LLWorkerClass class LLTextureFetchWorker : public LLWorkerClass
@@ -2367,6 +2368,7 @@ void LLTextureFetch::commonUpdate()
} }
} }
// MAIN THREAD // MAIN THREAD
//virtual //virtual
S32 LLTextureFetch::update(F32 max_time_ms) S32 LLTextureFetch::update(F32 max_time_ms)
@@ -2382,14 +2384,20 @@ S32 LLTextureFetch::update(F32 max_time_ms)
mNetworkQueueMutex.unlock() ; mNetworkQueueMutex.unlock() ;
} }
S32 res = LLWorkerThread::update(max_time_ms); S32 res = LLWorkerThread::update(max_time_ms);
if (!mDebugPause) if (!mDebugPause)
{ {
sendRequestListToSimulators(); // this is the startup state when send_complete_agent_movement() message is sent.
// Before this, the RequestImages message sent by sendRequestListToSimulators
// won't work so don't bother trying
if (LLStartUp::getStartupState() > STATE_AGENT_SEND)
{
sendRequestListToSimulators();
}
} }
if (!mThreaded) if (!mThreaded)
{ {
commonUpdate(); commonUpdate();