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

Redid ScriptCounter entirely, should fix 182, if not just prevent the permanent failure condition.

Browse Source 
Script Counter now shows the names of avatars in the user's desired format.
Adds "Count Scripts in Selection" to the Tools menu. (Can count for multiple objects, quite useful for land owners, no?)
Makes the Script Counting strings translatable. (ScriptCounting, ScriptCountAvatar, ScriptCountObject, and ScriptDeleteObject)

ScriptCounter is no longer a giant pile of static, it goes away when it has run its course and multiple instances can exist simultaneously.
Removes the silly unneeded parts of ScriptCounter, and thus removes it from llstartup.cpp
Adds some nice documentation in comments, and moves some log output to proper places (although I commented it out, it proved quite spammy for high primcount objects, initial loop runs super fast)
Trying to view this diff with no space changes is the best course of action, but even that will be tough...
Adds a header guard to scriptcounter.h
Hooks up menu function LLObjectVisibleScriptCount to Object.VisibleScriptCount, apparently this was never hooked up.... strange
This commit is contained in:
Lirusaito
2013-05-22 11:01:43 -04:00
parent ea52583510
commit e3bd635510
6 changed files with 125 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
indra/newview/scriptcounter.h
View File

@@ -28,51 +28,31 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef SCRIPTCOUNTER_H
#define SCRIPTCOUNTER_H
#include "llagent.h"
#include "llvoinventorylistener.h"
class ScriptCounter : public LLVOInventoryListener
{
public:
ScriptCounter();
ScriptCounter(bool do_delete, LLViewerObject* object);
~ScriptCounter();
private:
static ScriptCounter* sInstance;
static void init();
static LLSD* getprim(LLUUID id);
static void completechk();
public:
static void processObjectPropertiesFamily(LLMessageSystem* msg, void** user_data);
static void processObjectProperties(LLMessageSystem* msg, void** user_data);
void inventoryChanged(LLViewerObject* obj,
LLInventoryObject::object_list_t* inv,
S32 serial_num,
void* data);
static ScriptCounter* getInstance(){ init(); return sInstance; }
static void serialize(LLDynamicArray<LLViewerObject*> objects);
static void serializeSelection(bool delScript);
static void finalize(LLSD data);
static void showResult(std::string output);
/*virtual*/ void inventoryChanged(LLViewerObject* obj, LLInventoryObject::object_list_t* inv, S32, void*);
void requestInventories();
private:
static void subserialize(LLViewerObject* linkset);
void requestInventoriesFor(LLViewerObject* object);
void requestInventoryFor(LLViewerObject* object);
enum ExportState { IDLE, COUNTING };
static U32 status;
static U32 invqueries;
static U32 scriptcount;
static LLUUID reqObjectID;
static std::set<std::string> objIDS;
static LLDynamicArray<LLUUID> delUUIDS;
static int objectCount;
static LLViewerObject* foo;
static bool doDelete;
static std::stringstream sstr;
static int countingDone;
bool doDelete;
LLViewerObject* foo;
int inventories;
int objectCount;
bool requesting;
int scriptcount;
};
#endif //SCRIPTCOUNTER_H