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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-27 04:36:33 -04:00
parent e78112ae12 3c3281edb5
commit 1c11b42a08
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llvoavatar.cpp
View File

@@ -5619,8 +5619,8 @@ void LLVOAvatar::processAnimationStateChanges()
stop_glerror(); stop_glerror();
} }
/*Here's that undeform function I was talking about. -HGB //Here's that undeform function I was talking about. -HGB
// Bug-fixed Linden Labs style. Comment out 4ever. /* Bug-fixed Linden Labs style. Comment out 4ever.
std::string undeformers[] = std::string undeformers[] =
{ {
"7a8a3dfc-acd1-7ac3-9cdf-71cd9be89969", "7a8a3dfc-acd1-7ac3-9cdf-71cd9be89969",

18
indra/newview/scriptcounter.cpp
View File

@@ -104,11 +104,11 @@ void ScriptCounter::processObjectPropertiesFamily(LLMessageSystem* msg, void** u
{ {
if(doDelete) if(doDelete)
{ {
user_msg = llformat("Deleted %u scripts from object %s.", scriptcount, name); user_msg = llformat("Deleted %u scripts from object %s.", scriptcount , name.c_str());
} }
else else
{ {
user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name); user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name.c_str());
} }
reqObjectID.setNull(); reqObjectID.setNull();
if(countingDone) if(countingDone)
@@ -130,11 +130,11 @@ void ScriptCounter::processObjectProperties(LLMessageSystem* msg, void** user_da
{ {
if(doDelete) if(doDelete)
{ {
user_msg = llformat("Deleted %u scripts from object %s.", scriptcount, name); user_msg = llformat("Deleted %u scripts from object %s.", scriptcount, name.c_str());
} }
else else
{ {
user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name); user_msg = llformat("Counted %u scripts in object %s.", scriptcount, name.c_str());
} }
reqObjectID.setNull(); reqObjectID.setNull();
if(countingDone) if(countingDone)
@@ -146,7 +146,7 @@ void ScriptCounter::processObjectProperties(LLMessageSystem* msg, void** user_da
void ScriptCounter::serializeSelection(bool delScript) void ScriptCounter::serializeSelection(bool delScript)
{ {
LLDynamicArray<LLViewerObject*> catfayse; LLDynamicArray<LLViewerObject*> objectArray;
foo=LLSelectMgr::getInstance()->getSelection()->getPrimaryObject(); foo=LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
sstr.str(""); sstr.str("");
doDelete=false; doDelete=false;
@@ -173,7 +173,7 @@ void ScriptCounter::serializeSelection(bool delScript)
LLViewerObject* object = attachment->getObject(); LLViewerObject* object = attachment->getObject();
if(object) if(object)
{ {
catfayse.put(object); objectArray.put(object);
objectCount++; objectCount++;
} }
} }
@@ -188,7 +188,7 @@ void ScriptCounter::serializeSelection(bool delScript)
LLViewerObject* object = selectNode->getObject(); LLViewerObject* object = selectNode->getObject();
if(object) if(object)
{ {
catfayse.put(object); objectArray.put(object);
objectCount++; objectCount++;
} }
} }
@@ -240,7 +240,7 @@ void ScriptCounter::serializeSelection(bool delScript)
gAgent.sendReliableMessage(); gAgent.sendReliableMessage();
} }
} }
serialize(catfayse); serialize(objectArray);
} }
} }
@@ -310,7 +310,7 @@ void ScriptCounter::completechk()
valid=0; valid=0;
if(valid) if(valid)
{ {
user_msg = llformat("Counted %u scripts in %u attachments on %s %s.", scriptcount, objectCount, firstname->getString(), lastname->getString()); user_msg = llformat("Counted %u scripts in %u attachments on %s %s.", scriptcount, objectCount, firstname->getString() , lastname->getString());
//sstr << "Counted scripts from " << << " attachments on " << firstname->getString() << " " << lastname->getString() << ": "; //sstr << "Counted scripts from " << << " attachments on " << firstname->getString() << " " << lastname->getString() << ": ";
} }
} }