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

added viewer 2.0 tag, apparently something in the way tags are handled has changed...

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-09 07:07:06 -03:00
parent 6e3059ead5
commit 40cd4c3034
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llimportobject.cpp
View File

@@ -16,6 +16,7 @@
#include "llinventorymodel.h"
#include "lluictrlfactory.h"
#include "llscrolllistctrl.h"
#include "llviewercontrol.h"
#include "llfloaterimport.h"
@@ -103,6 +104,16 @@ void LLXmlImportOptions::init(LLSD llsd)
else
mChildObjects.push_back(unsorted_objects[i]);
}
F32 throttle = gSavedSettings.getF32("OutBandwidth");
// Gross magical value that is 128kbit/s
// Sim appears to drop requests if they come in faster than this. *sigh*
if(throttle < 128000.)
{
gMessageSystem->mPacketRing.setOutBandwidth(128000.0);
}
gMessageSystem->mPacketRing.setUseOutThrottle(TRUE);
}
std::string terse_F32_string( F32 f )
@@ -721,6 +732,18 @@ void LLXmlImport::onNewPrim(LLViewerObject* object)
gMessageSystem->sendReliable(gAgent.getRegionHost());
}
}
F32 throttle = gSavedSettings.getF32("OutBandwidth");
if(throttle != 0.)
{
gMessageSystem->mPacketRing.setOutBandwidth(throttle);
gMessageSystem->mPacketRing.setUseOutThrottle(TRUE);
}
else
{
gMessageSystem->mPacketRing.setOutBandwidth(0.0);
gMessageSystem->mPacketRing.setUseOutThrottle(FALSE);
}
}
LLFloaterImportProgress::update();

13
indra/newview/llvoavatar.cpp
View File

@@ -3165,7 +3165,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
}
else
{
std::string uuid_str = getTEImage(TEX_HEAD_BODYPAINT)->getID().asString();
std::string uuid_str = getTE(0)->getID().asString();
if(uuid_str == "ccda2b3b-e72c-a112-e126-fee238b67218")
{
@@ -3248,11 +3248,22 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
mNameText->setColor(gColors.getColor( "AvatarNameColor" ));
line += " (NeilLife)";
}
else if(uuid_str == "cc7a030f-282f-c165-44d2-b5ee572e72bf")
{
mNameText->setColor(LLColor4(0.2f, 0.5f, 1.0f));
line += " (Imprudence)";
}
else if(uuid_str == "c228d1cf-4b5d-4ba8-84f4-899a0796aa97")
{
mNameText->setColor(LLColor4(0.5f, 0.5f, 0.5f));
line += " (Viewer 2.0)";
}
else
{
LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
avatar_name_color.setAlpha(1.f);
llinfos << "Apparently this tag isn't registered: " << uuid_str << llendl;
mNameText->setColor(avatar_name_color);
}
}