Merge branch 'nicholaz-patches' into next

7 files changed, 101 insertions, 30 deletions

diff --git a/linden/indra/llmessage/llassetstorage.cpp b/linden/indra/llmessage/llassetstorage.cpp
index fa14a2b..2d85011 100644
--- a/linden/indra/llmessage/llassetstorage.cpp
+++ b/linden/indra/llmessage/llassetstorage.cpp
@@ -522,16 +522,19 @@ void LLAssetStorage::downloadCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data, LLExtStat ext_status)
+        void* callback_parm_req, LLExtStat ext_status)
 {
         lldebugs << "LLAssetStorage::downloadCompleteCallback() for " << file_id
                  << "," << LLAssetType::lookup(file_type) << llendl;
-        LLAssetRequest* req = (LLAssetRequest*)user_data;
+
+        // be careful! req may be a ptr to memory already freed (a timeout does this)
+        LLAssetRequest* req = (LLAssetRequest*)callback_parm_req;       
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadCompleteCallback called without"
                         "a valid request." << llendl;
-                return;
+                // we can live with a null pointer, we're not allowed to deref the ptr anyway (see above)
+                // return;  
         }
         if (!gAssetStorage)
         {
@@ -539,12 +542,10 @@ void LLAssetStorage::downloadCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset " << req->getUUID() << llendl;
@@ -563,7 +564,7 @@ void LLAssetStorage::downloadCompleteCallback(
         {
                 request_list_t::iterator curiter = iter++;
                 LLAssetRequest* tmp = *curiter;
-                if ((tmp->getUUID() == req->getUUID()) && (tmp->getType()== req->getType()))
+                if ((tmp->getUUID() == file_id) && (tmp->getType() == file_type))
                 {
                         requests.push_front(tmp);
                         iter = gAssetStorage->mPendingDownloads.erase(curiter);
@@ -576,7 +577,7 @@ void LLAssetStorage::downloadCompleteCallback(
                 LLAssetRequest* tmp = *curiter;
                 if (tmp->mDownCallback)
                 {
-                        tmp->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), tmp->mUserData, result, ext_status);
+                        tmp->mDownCallback(gAssetStorage->mVFS, tmp->getUUID(), tmp->getType(), tmp->mUserData, result, ext_status);
                 }
                 delete tmp;
         }
@@ -672,10 +673,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data,
+        void* callback_parm_req,
         LLExtStat ext_status)
 {
-        LLEstateAssetRequest *req = (LLEstateAssetRequest*)user_data;
+        LLEstateAssetRequest *req = (LLEstateAssetRequest*)callback_parm_req;
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
@@ -689,12 +690,10 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getAType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
@@ -704,7 +703,9 @@ void LLAssetStorage::downloadEstateAssetCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getAType(), req->mUserData, result, ext_status);
+        req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
+
+        delete req;
 }
 
 void LLAssetStorage::getInvItemAsset(const LLHost &object_sim, const LLUUID &agent_id, const LLUUID &session_id,
@@ -809,10 +810,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
         S32 result,
         const LLUUID& file_id,
         LLAssetType::EType file_type,
-        void* user_data,
+        void* callback_parm_req,
         LLExtStat ext_status)
 {
-        LLInvItemRequest *req = (LLInvItemRequest*)user_data;
+        LLInvItemRequest *req = (LLInvItemRequest*)callback_parm_req;
         if(!req)
         {
                 llwarns << "LLAssetStorage::downloadEstateAssetCompleteCallback called"
@@ -825,12 +826,10 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
                 return;
         }
 
-        req->setUUID(file_id);
-        req->setType(file_type);
         if (LL_ERR_NOERR == result)
         {
                 // we might have gotten a zero-size file
-                LLVFile vfile(gAssetStorage->mVFS, req->getUUID(), req->getType());
+                LLVFile vfile(gAssetStorage->mVFS, file_id, file_type);
                 if (vfile.getSize() <= 0)
                 {
                         llwarns << "downloadCompleteCallback has non-existent or zero-size asset!" << llendl;
@@ -840,7 +839,9 @@ void LLAssetStorage::downloadInvItemCompleteCallback(
                 }
         }
 
-        req->mDownCallback(gAssetStorage->mVFS, req->getUUID(), req->getType(), req->mUserData, result, ext_status);
+        req->mDownCallback(gAssetStorage->mVFS, file_id, file_type, req->mUserData, result, ext_status);
+
+        delete req;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 2352be3..4561110 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -1363,7 +1363,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
         for(avatar_it = LLCharacter::sInstances.begin(); avatar_it != LLCharacter::sInstances.end(); ++avatar_it)
         {
                 LLVOAvatar* avatarp = (LLVOAvatar*)*avatar_it;
-                if (dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
+                if (!avatarp->isDead() &&  dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) <= CHAT_NORMAL_RADIUS)
                 {
                         setSpeaker(avatarp->getID());
                 }
@@ -1377,7 +1377,7 @@ void LLLocalSpeakerMgr::updateSpeakerList()
                 if (speakerp->mStatus == LLSpeaker::STATUS_TEXT_ONLY)
                 {
                         LLVOAvatar* avatarp = (LLVOAvatar*)gObjectList.findObject(speaker_id);
-                        if (!avatarp || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
+                        if (!avatarp || avatarp->isDead() || dist_vec(avatarp->getPositionAgent(), gAgent.getPositionAgent()) > CHAT_NORMAL_RADIUS)
                         {
                                 speakerp->mStatus = LLSpeaker::STATUS_NOT_IN_CHANNEL;
                                 speakerp->mDotColor = INACTIVE_COLOR;
diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index ce35377..8044859 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -892,6 +892,8 @@ LLTextureCache::LLTextureCache(bool threaded)
 
 LLTextureCache::~LLTextureCache()
 {
+        purgeTextureFilesTimeSliced(TRUE); // force-flush all pending file deletes
+
         apr_pool_destroy(mFileAPRPool);
 }
 
@@ -1196,7 +1198,7 @@ void LLTextureCache::purgeTextures(bool validate)
                 return;
         }
         
-        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Reading Entries..." << LL_ENDL;
+        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Reading " << num_entries << " Entries from " << mTexturesDirEntriesFileName << LL_ENDL;
         
         std::map<LLUUID, S32> entry_idx_map;
         S64 total_size = 0;
@@ -1225,7 +1227,7 @@ void LLTextureCache::purgeTextures(bool validate)
                 LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Validating: " << validate_idx << LL_ENDL;
         }
         
-        S64 min_cache_size = (sCacheMaxTexturesSize * 9) / 10;
+        S64 min_cache_size = sCacheMaxTexturesSize / 100 * 95;
         S32 purge_count = 0;
         S32 next_idx = 0;
         for (S32 idx=0; idx<num_entries; idx++)
@@ -1259,8 +1261,8 @@ void LLTextureCache::purgeTextures(bool validate)
                 if (purge_entry)
                 {
                         purge_count++;
-                        LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
-                        ll_apr_file_remove(filename, NULL);
+                        LL_DEBUGS("TextureCache") << "PURGING: " << filename << LL_ENDL;
+                        mFilesToDelete.push_back(filename);
                         total_size -= entries[idx].mSize;
                         entries[idx].mSize = 0;
                 }
@@ -1275,7 +1277,11 @@ void LLTextureCache::purgeTextures(bool validate)
         }
         num_entries = next_idx;
 
-        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Writing Entries: " << num_entries << LL_ENDL;
+        mTimeLastFileDelete.reset();
+
+        LL_DEBUGS("TextureCache") << "TEXTURE CACHE: Writing Entries: " 
+                << num_entries << " (" << num_entries*sizeof(Entry)/1024 << "KB)"
+                << LL_ENDL;
         
         ll_apr_file_remove(mTexturesDirEntriesFileName, NULL);
         ll_apr_file_write_ex(mTexturesDirEntriesFileName, NULL,
@@ -1298,10 +1304,56 @@ void LLTextureCache::purgeTextures(bool validate)
         LL_INFOS("TextureCache") << "TEXTURE CACHE:"
                         << " PURGED: " << purge_count
                         << " ENTRIES: " << num_entries
-                        << " CACHE SIZE: " << total_size / 1024*1024 << " MB"
+                        << " CACHE SIZE: " << total_size/1024/1024 << " MB"
                         << llendl;
 }
 
+
+void LLTextureCache::purgeTextureFilesTimeSliced(BOOL force_all)
+{
+        LLMutexLock lock(&mHeaderMutex);
+
+        F32 delay_between_passes = 1.0f; // seconds
+        F32 max_time_per_pass = 0.1f; // seconds
+
+        if (!force_all && mTimeLastFileDelete.getElapsedTimeF32() <= delay_between_passes) 
+        {
+                return;
+        }
+
+        LLTimer timer;
+        S32 howmany = 0;
+
+        if (mFilesToDelete.size() > 0)
+        {
+                llinfos << "TEXTURE CACHE: " << mFilesToDelete.size() << " files scheduled for deletion" << llendl;
+        }
+
+        for (LLTextureCache::filename_list_t::iterator iter = mFilesToDelete.begin(); iter!=mFilesToDelete.end(); ) 
+        {       
+                LLTextureCache::filename_list_t::iterator iter2 = iter++;
+                ll_apr_file_remove(*iter2, NULL);
+                mFilesToDelete.erase(iter2);
+                howmany++;
+
+                if (!force_all && timer.getElapsedTimeF32() > max_time_per_pass) 
+                {
+                        break;
+                }
+        }
+
+        if (!mFilesToDelete.empty())
+        {
+                llinfos << "TEXTURE CACHE: "<< howmany << " files deleted (" 
+                                << mFilesToDelete.size() << " files left for next pass)" 
+                                << llendl;
+        }
+
+        mTimeLastFileDelete.reset();
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////////
 
 // call lockWorkers() first!
@@ -1471,6 +1523,10 @@ LLTextureCache::handle_t LLTextureCache::writeToCache(const LLUUID& id, U32 prio
                 purgeTextures(false);
                 mDoPurge = FALSE;
         }
+
+        purgeTextureFilesTimeSliced();  // purge textures from cache in a non-hiccup-way
+
+
         if (datasize >= TEXTURE_CACHE_ENTRY_SIZE)
         {
                 LLMutexLock lock(&mWorkersMutex);
diff --git a/linden/indra/newview/lltexturecache.h b/linden/indra/newview/lltexturecache.h
index 4bac15c..b5abb67 100644
--- a/linden/indra/newview/lltexturecache.h
+++ b/linden/indra/newview/lltexturecache.h
@@ -122,6 +122,7 @@ private:
         void readHeaderCache(apr_pool_t* poolp = NULL);
         void purgeAllTextures(bool purge_directories);
         void purgeTextures(bool validate);
+        void purgeTextureFilesTimeSliced(BOOL force_all = FALSE);
         S32 getHeaderCacheEntry(const LLUUID& id, bool touch, S32* imagesize = NULL);
         bool removeHeaderCacheEntry(const LLUUID& id);
         void lockHeaders() { mHeaderMutex.lock(); }
@@ -143,6 +144,10 @@ private:
 
         typedef std::vector<std::pair<LLPointer<Responder>, bool> > responder_list_t;
         responder_list_t mCompletedList;
+
+        typedef std::list<std::string> filename_list_t;
+        filename_list_t mFilesToDelete;
+        LLTimer mTimeLastFileDelete;
         
         BOOL mReadOnly;
         
diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 39070b7..72ee24b 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -850,6 +850,12 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop,
                 {
                         LLInventoryObject* cargo = locateInventory(item, cat);
 
+                        if (!cargo) 
+                        {
+                                handled = FALSE;
+                                break;
+                        }
+
                         EAcceptance item_acceptance = ACCEPT_NO;
                         handled = handled && root_view->handleDragAndDrop(x, y, mask, FALSE,
                                                                                                 mCargoTypes[mCurItemIndex],
diff --git a/linden/indra/newview/llviewerjointattachment.h b/linden/indra/newview/llviewerjointattachment.h
index 8e665aa..a69c10c 100644
--- a/linden/indra/newview/llviewerjointattachment.h
+++ b/linden/indra/newview/llviewerjointattachment.h
@@ -98,8 +98,7 @@ protected:
         void calcLOD();
         
 protected:
-        // Backlink only; don't make this an LLPointer.
-        LLViewerObject* mAttachedObject;
+        LLPointer<LLViewerObject> mAttachedObject;
         BOOL                    mVisibleInFirst;
         LLVector3               mOriginalPos;
         S32                             mGroup;
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index 163b039..4fac9bc 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -861,6 +861,10 @@ void LLViewerObjectList::killObjects(LLViewerRegion *regionp)
                 if (objectp->mRegionp == regionp)
                 {
                         killObject(objectp);
+
+                        // invalidate region pointer. region will become invalid, but 
+                        // refcounted objects may survive the cleanDeadObjects() call below
+                        objectp->mRegionp = NULL;        
                 }
         }