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

Clean up ScriptCounter code more

Browse Source
This commit is contained in:
Liru Færs
2020-01-12 12:33:10 -05:00
parent 8005a58ed5
commit 64b43a47b5
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llstartup.cpp
View File

@@ -3019,17 +3019,7 @@ void pass_processObjectPropertiesFamily(LLMessageSystem *msg, void**)
void process_script_running_reply(LLMessageSystem* msg, void** v) void process_script_running_reply(LLMessageSystem* msg, void** v)
{ {
LLLiveLSLEditor::processScriptRunningReply(msg, v); LLLiveLSLEditor::processScriptRunningReply(msg, v);
if (ScriptCounter::sCheckMap.size()) ScriptCounter::processScriptRunningReply(msg);
{
LLUUID item_id;
msg->getUUIDFast(_PREHASH_Script, _PREHASH_ItemID, item_id);
std::map<LLUUID,ScriptCounter*>::iterator it = ScriptCounter::sCheckMap.find(item_id);
if (it != ScriptCounter::sCheckMap.end())
{
it->second->processRunningReply(msg);
ScriptCounter::sCheckMap.erase(it);
}
}
} }
void register_viewer_callbacks(LLMessageSystem* msg) void register_viewer_callbacks(LLMessageSystem* msg)

15
indra/newview/scriptcounter.cpp
View File

@@ -165,6 +165,21 @@ void ScriptCounter::inventoryChanged(LLViewerObject* obj, LLInventoryObject::obj
summarize(); summarize();
} }
void ScriptCounter::processScriptRunningReply(LLMessageSystem* msg)
{
if (!sCheckMap.empty())
{
LLUUID item_id;
msg->getUUIDFast(_PREHASH_Script, _PREHASH_ItemID, item_id);
auto it = sCheckMap.find(item_id);
if (it != sCheckMap.end())
{
it->second->processRunningReply(msg);
sCheckMap.erase(it);
}
}
}
void ScriptCounter::processRunningReply(LLMessageSystem* msg) void ScriptCounter::processRunningReply(LLMessageSystem* msg)
{ {
BOOL is; BOOL is;

6
indra/newview/scriptcounter.h
View File

@@ -33,19 +33,19 @@
#include "llvoinventorylistener.h" #include "llvoinventorylistener.h"
class ScriptCounter : public LLInstanceTracker<ScriptCounter, LLUUID>, public LLVOInventoryListener class ScriptCounter final : public LLInstanceTracker<ScriptCounter, LLUUID>, public LLVOInventoryListener
{ {
public: public:
ScriptCounter(bool do_delete, LLViewerObject* object); ScriptCounter(bool do_delete, LLViewerObject* object);
~ScriptCounter(); ~ScriptCounter();
/*virtual*/ void inventoryChanged(LLViewerObject* obj, LLInventoryObject::object_list_t* inv, S32, void*); void inventoryChanged(LLViewerObject* obj, LLInventoryObject::object_list_t* inv, S32, void*) override;
void requestInventories(); void requestInventories();
static void processScriptRunningReply(LLMessageSystem* msg);
private: private:
void requestInventoriesFor(LLViewerObject* object); void requestInventoriesFor(LLViewerObject* object);
void requestInventoryFor(LLViewerObject* object); void requestInventoryFor(LLViewerObject* object);
friend void process_script_running_reply(LLMessageSystem* msg, void**);
void processRunningReply(LLMessageSystem* msg); void processRunningReply(LLMessageSystem* msg);
void summarize(); // Check if finished, if so, output and destroy. void summarize(); // Check if finished, if so, output and destroy.