livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes to use the new stats system.

Nicky 2014-06-10 19:04:04 +02:00
parent 18e524b501
commit 3e299bee08
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/fsfloatercontacts.cpp
View File

@ -987,4 +987,11 @@ void FSFloaterContacts::sendRightsGrant(rights_map_t& ids)
gAgent.sendReliableMessage();
}
void FSFloaterContacts::childShowTab(const std::string& id, const std::string& tabname )
{
LLTabContainer* child = findChild<LLTabContainer>(id);
if (child)
child->selectTabByName(tabname);
}
// EOF

2
indra/newview/fsfloatercontacts.h
View File

@ -142,6 +142,8 @@ private:
LLCachedControl<bool> mSortByUserName;
std::string mFriendListFontName;
void childShowTab(const std::string& id, const std::string& tabname);
};

10
indra/newview/fsfloaterimport.cpp
View File

@ -65,6 +65,8 @@
#include "llvfile.h"
#include "llvfs.h"
#include "llvolumemessage.h"
#include "llviewerstats.h"
#include "lltrace.h"
#include "fsexportperms.h"
#include "material_codes.h"
#include <boost/algorithm/string_regex.hpp>
@ -707,7 +709,7 @@ void FSFloaterImport::createPrim()
gMessageSystem->addU8Fast(_PREHASH_State, (U8)0);
gMessageSystem->addUUIDFast(_PREHASH_RayTargetID, LLUUID::null);
gMessageSystem->sendReliable(gAgent.getRegion()->getHost());
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CREATE_COUNT);
add(LLStatViewer::OBJECT_CREATE);
}
bool FSFloaterImport::processPrimCreated(LLViewerObject* object)
@ -1207,7 +1209,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
new_file_agent_inventory = true;
}
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_TEXTURE_COUNT);
add(LLStatViewer::UPLOAD_TEXTURE_COUNT);
}
break;
case LLAssetType::AT_SOUND:
@ -1223,7 +1225,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
{
url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
new_file_agent_inventory = true;
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_SOUND_COUNT);
add(LLVStatViewer::UPLOAD_SOUND_COUNT);
}
}
@ -1339,7 +1341,7 @@ void FSFloaterImport::uploadAsset(LLUUID asset_id, LLUUID inventory_item)
{
url = gAgent.getRegion()->getCapability("NewFileAgentInventory");
new_file_agent_inventory = true;
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_UPLOAD_ANIM_COUNT);
add(LLStatViewer::UPLOAD_ANIM_COUNT);
}
}
break;

2
indra/newview/fsfloaternearbychat.cpp
View File

@ -1339,7 +1339,7 @@ void send_chat_from_nearby_floater(std::string utf8_out_text, EChatType type, S3
}
// moved here so we don't bump the count for every message segment
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
add(LLStatViewer::CHAT_COUNT,1);
//</FS:TS> FIRE-787
}

2
indra/newview/fsfloatervolumecontrols.cpp
View File

@ -62,7 +62,7 @@ BOOL FSFloaterVolumeControls::postBuild()
void FSFloaterVolumeControls::handleVisibilityChange(BOOL new_visibility)
{
UtilityBar::instance().setVolumeControlsButtonExpanded(new_visibility);
LLFloater::handleVisibilityChange(new_visibility);
LLFloater::onVisibilityChange(new_visibility);
}
//<FS:KC> Handled centrally now

2
indra/newview/fsnearbychathub.cpp
View File

@ -207,7 +207,7 @@ void send_chat_from_viewer(std::string utf8_out_text, EChatType type, S32 channe
}
// moved here so we don't bump the count for every message segment
LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
add(LLStatViewer::CHAT_COUNT,1);
//</FS:TS> FIRE-787
}