summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/llappearance/llpolymesh.cpp16
-rw-r--r--indra/llappearance/lltexlayer.cpp16
-rw-r--r--indra/llappearance/lltexlayerparams.cpp3
-rw-r--r--indra/llaudio/llaudioengine_fmodex.cpp12
-rw-r--r--indra/llaudio/llstreamingaudio_fmodex.cpp18
-rwxr-xr-xindra/llcommon/llavatarname.cpp10
-rwxr-xr-xindra/llcommon/lleventcoro.h34
-rwxr-xr-xindra/llcommon/llprocess.cpp23
8 files changed, 67 insertions, 65 deletions
diff --git a/indra/llappearance/llpolymesh.cpp b/indra/llappearance/llpolymesh.cpp
index 907aa21279..e176d0844b 100644
--- a/indra/llappearance/llpolymesh.cpp
+++ b/indra/llappearance/llpolymesh.cpp
@@ -889,10 +889,10 @@ void LLPolyMesh::dumpDiagInfo()
std::string buf;
- LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
- LL_DEBUGS("LLPolyMesh") << " Global PolyMesh Table (DEBUG only)" << llendl;
- LL_DEBUGS("LLPolyMesh") << " Verts Faces Mem(KB) Name" << llendl;
- LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
+ //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
+ //LL_DEBUGS("LLPolyMesh") << " Global PolyMesh Table (DEBUG only)" << llendl;
+ //LL_DEBUGS("LLPolyMesh") << " Verts Faces Mem(KB) Name" << llendl;
+ //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
// print each loaded mesh, and it's memory usage
for(LLPolyMeshSharedDataTable::iterator iter = sGlobalSharedMeshList.begin();
@@ -906,17 +906,17 @@ void LLPolyMesh::dumpDiagInfo()
U32 num_kb = mesh->getNumKB();
buf = llformat("%8d %8d %8d %s", num_verts, num_faces, num_kb, mesh_name.c_str());
- LL_DEBUGS("LLPolyMesh") << buf << llendl;
+ //LL_DEBUGS("LLPolyMesh") << buf << llendl;
total_verts += num_verts;
total_faces += num_faces;
total_kb += num_kb;
}
- LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
+ //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
buf = llformat("%8d %8d %8d TOTAL", total_verts, total_faces, total_kb );
- LL_DEBUGS("LLPolyMesh") << buf << llendl;
- LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
+ //LL_DEBUGS("LLPolyMesh") << buf << llendl;
+ //LL_DEBUGS("LLPolyMesh") << "-----------------------------------------------------" << llendl;
}
//-----------------------------------------------------------------------------
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index e40a2ab200..228cdcd5ba 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -1203,7 +1203,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height)
}
else
{
- LL_DEBUGS("LLTexLayer") << "lto not defined or image not defined: " << getInfo()->getLocalTexture() << " lto: " << mLocalTextureObject << llendl;
+ //LL_DEBUGS("LLTexLayer") << "lto not defined or image not defined: " << getInfo()->getLocalTexture() << " lto: " << mLocalTextureObject << llendl;
}
// if( mTexLayerSet->getAvatarAppearance()->getLocalTextureGL((ETextureIndex)getInfo()->mLocalTexture, &image_gl ) )
{
@@ -1291,7 +1291,7 @@ BOOL LLTexLayer::render(S32 x, S32 y, S32 width, S32 height)
if( !success )
{
- LL_DEBUGS("LLTexLayer") << "LLTexLayer::render() partial: " << getInfo()->mName << llendl;
+ //LL_DEBUGS("LLTexLayer") << "LLTexLayer::render() partial: " << getInfo()->mName << llendl;
}
return success;
}
@@ -1891,18 +1891,18 @@ LLTexLayerStaticImageList::~LLTexLayerStaticImageList()
void LLTexLayerStaticImageList::dumpByteCount() const
{
- LL_DEBUGS("LLTexLayerStaticImageList") << "Avatar Static Textures " <<
- "KB GL:" << (mGLBytes / 1024) <<
- "KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
+ //LL_DEBUGS("LLTexLayerStaticImageList") << "Avatar Static Textures " <<
+ // "KB GL:" << (mGLBytes / 1024) <<
+ // "KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
}
void LLTexLayerStaticImageList::deleteCachedImages()
{
if( mGLBytes || mTGABytes )
{
- LL_DEBUGS("LLTexLayerStaticImageList") << "Clearing Static Textures " <<
- "KB GL:" << (mGLBytes / 1024) <<
- "KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
+ //LL_DEBUGS("LLTexLayerStaticImageList") << "Clearing Static Textures " <<
+ // "KB GL:" << (mGLBytes / 1024) <<
+ // "KB TGA:" << (mTGABytes / 1024) << "KB" << llendl;
//mStaticImageLists uses LLPointers, clear() will cause deletion
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 49e0546544..6cbc6bdf34 100644
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -86,7 +86,8 @@ void LLTexLayerParamAlpha::dumpCacheByteCount()
{
S32 gl_bytes = 0;
getCacheByteCount( &gl_bytes);
- LL_DEBUGS("LLTexLayerParamAlpha") << "Processed Alpha Texture Cache GL:" << (gl_bytes/1024) << "KB" << llendl;
+ // BUG-2707?
+ //LL_DEBUGS("LLTexLayerParamAlpha") << "Processed Alpha Texture Cache GL:" << (gl_bytes/1024) << "KB" << llendl;
}
// static
diff --git a/indra/llaudio/llaudioengine_fmodex.cpp b/indra/llaudio/llaudioengine_fmodex.cpp
index 6774844444..baa5fa64de 100644
--- a/indra/llaudio/llaudioengine_fmodex.cpp
+++ b/indra/llaudio/llaudioengine_fmodex.cpp
@@ -75,12 +75,14 @@ void* F_STDCALL decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const cha
{
if(type & FMOD_MEMORY_STREAM_DECODE)
{
- LL_DEBUGS("FMODEX") << "Decode buffer size: " << size << llendl;
+ //LL_DEBUGS("FMODEX") << "Decode buffer size: " << size << llendl;
}
else if(type & FMOD_MEMORY_STREAM_FILE)
{
- LL_DEBUGS("FMODEX") << "Strean buffer size: " << size << llendl;
+ //LL_DEBUGS("FMODEX") << "Strean buffer size: " << size << llendl;
}
+ if (size > (1L << 24))
+ return NULL;
return new char[size];
}
void* F_STDCALL decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
@@ -304,16 +306,16 @@ void LLAudioEngine_FMODEX::shutdown()
{
stopInternetStream();
- LL_DEBUGS("FMODEX") << "About to LLAudioEngine::shutdown()" << llendl;
+ //LL_DEBUGS("FMODEX") << "About to LLAudioEngine::shutdown()" << llendl;
LLAudioEngine::shutdown();
- LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() closing FMOD Ex" << llendl;
+ //LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() closing FMOD Ex" << llendl;
if ( mSystem ) // speculative fix for MAINT-2657
{
mSystem->close();
mSystem->release();
}
- LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() done closing FMOD Ex" << llendl;
+ //LL_DEBUGS("FMODEX") << "LLAudioEngine_FMODEX::shutdown() done closing FMOD Ex" << llendl;
delete mListenerp;
mListenerp = NULL;
diff --git a/indra/llaudio/llstreamingaudio_fmodex.cpp b/indra/llaudio/llstreamingaudio_fmodex.cpp
index 794a9540f4..96b739fa13 100644
--- a/indra/llaudio/llstreamingaudio_fmodex.cpp
+++ b/indra/llaudio/llstreamingaudio_fmodex.cpp
@@ -100,13 +100,13 @@ void LLStreamingAudio_FMODEX::start(const std::string& url)
if (!url.empty())
{
- LL_DEBUGS("FMODEX") << "Starting internet stream: " << url << llendl;
+ //LL_DEBUGS("FMODEX") << "Starting internet stream: " << url << llendl;
mCurrentInternetStreamp = new LLAudioStreamManagerFMODEX(mSystem,url);
mURL = url;
}
else
{
- LL_DEBUGS("FMODEX") << "Set internet stream to null" << llendl;
+ //LL_DEBUGS("FMODEX") << "Set internet stream to null" << llendl;
mURL.clear();
}
}
@@ -121,7 +121,7 @@ void LLStreamingAudio_FMODEX::update()
LLAudioStreamManagerFMODEX *streamp = *iter;
if (streamp->stopStream())
{
- LL_DEBUGS("FMODEX") << "Closed dead stream" << llendl;
+ //LL_DEBUGS("FMODEX") << "Closed dead stream" << llendl;
delete streamp;
mDeadStreams.erase(iter++);
}
@@ -181,7 +181,7 @@ void LLStreamingAudio_FMODEX::update()
{
if (!strcmp(tag.name, "Sample Rate Change"))
{
- LL_DEBUGS("FMODEX") << "Stream forced changing sample rate to " << *((float *)tag.data) << llendl;
+ //LL_DEBUGS("FMODEX") << "Stream forced changing sample rate to " << *((float *)tag.data) << llendl;
mFMODInternetStreamChannelp->setFrequency(*((float *)tag.data));
}
continue;
@@ -195,9 +195,9 @@ void LLStreamingAudio_FMODEX::update()
mFMODInternetStreamChannelp->getPaused(&paused);
if(!paused)
{
- LL_DEBUGS("FMODEX") << "Stream starvation detected! Pausing stream until buffer nearly full." << llendl;
- LL_DEBUGS("FMODEX") << " (diskbusy="<<diskbusy<<")" << llendl;
- LL_DEBUGS("FMODEX") << " (progress="<<progress<<")" << llendl;
+ //LL_DEBUGS("FMODEX") << "Stream starvation detected! Pausing stream until buffer nearly full." << llendl;
+ //LL_DEBUGS("FMODEX") << " (diskbusy="<<diskbusy<<")" << llendl;
+ //LL_DEBUGS("FMODEX") << " (progress="<<progress<<")" << llendl;
mFMODInternetStreamChannelp->setPaused(true);
}
}
@@ -220,14 +220,14 @@ void LLStreamingAudio_FMODEX::stop()
if (mCurrentInternetStreamp)
{
- LL_DEBUGS("FMODEX") << "Stopping internet stream: " << mCurrentInternetStreamp->getURL() << llendl;
+ //LL_DEBUGS("FMODEX") << "Stopping internet stream: " << mCurrentInternetStreamp->getURL() << llendl;
if (mCurrentInternetStreamp->stopStream())
{
delete mCurrentInternetStreamp;
}
else
{
- LL_DEBUGS("FMODEX") << "Pushing stream to dead list: " << mCurrentInternetStreamp->getURL() << llendl;
+ //LL_DEBUGS("FMODEX") << "Pushing stream to dead list: " << mCurrentInternetStreamp->getURL() << llendl;
mDeadStreams.push_back(mCurrentInternetStreamp);
}
mCurrentInternetStreamp = NULL;
diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index 642bd82e90..aaa7f1212f 100755
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -230,10 +230,10 @@ std::string LLAvatarName::getUserName() const
void LLAvatarName::dump() const
{
- LL_DEBUGS("AvNameCache") << "LLAvatarName: "
- << "user '" << mUsername << "' "
- << "display '" << mDisplayName << "' "
- << "expires in " << mExpires - LLFrameTimer::getTotalSeconds() << " seconds"
- << LL_ENDL;
+ //LL_DEBUGS("AvNameCache") << "LLAvatarName: "
+ // << "user '" << mUsername << "' "
+ // << "display '" << mDisplayName << "' "
+ // << "expires in " << mExpires - LLFrameTimer::getTotalSeconds() << " seconds"
+ // << LL_ENDL;
}
diff --git a/indra/llcommon/lleventcoro.h b/indra/llcommon/lleventcoro.h
index a42af63b65..f25c313920 100755
--- a/indra/llcommon/lleventcoro.h
+++ b/indra/llcommon/lleventcoro.h
@@ -220,21 +220,21 @@ LLSD postAndWait(SELF& self, const LLSD& event, const LLEventPumpOrPumpName& req
// request event.
LLSD modevent(event);
LLEventDetail::storeToLLSDPath(modevent, replyPumpNamePath, replyPump.getPump().getName());
- LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName
- << " posting to " << requestPump.getPump().getName()
- << LL_ENDL;
+ //LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName
+ // << " posting to " << requestPump.getPump().getName()
+ // << LL_ENDL;
// *NOTE:Mani - Removed because modevent could contain user's hashed passwd.
// << ": " << modevent << LL_ENDL;
requestPump.getPump().post(modevent);
}
- LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName
- << " about to wait on LLEventPump " << replyPump.getPump().getName()
- << LL_ENDL;
+ //LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName
+ // << " about to wait on LLEventPump " << replyPump.getPump().getName()
+ // << LL_ENDL;
// trying to dereference ("resolve") the future makes us wait for it
LLSD value(*future);
- LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName
- << " resuming with " << value << LL_ENDL;
+ //LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << listenerName
+ // << " resuming with " << value << LL_ENDL;
// returning should disconnect the connection
return value;
}
@@ -351,19 +351,19 @@ LLEventWithID postAndWait2(SELF& self, const LLSD& event,
replyPump0.getPump().getName());
LLEventDetail::storeToLLSDPath(modevent, replyPump1NamePath,
replyPump1.getPump().getName());
- LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name
- << " posting to " << requestPump.getPump().getName()
- << ": " << modevent << LL_ENDL;
+ //LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name
+ // << " posting to " << requestPump.getPump().getName()
+ // << ": " << modevent << LL_ENDL;
requestPump.getPump().post(modevent);
}
- LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name
- << " about to wait on LLEventPumps " << replyPump0.getPump().getName()
- << ", " << replyPump1.getPump().getName() << LL_ENDL;
+ //LL_DEBUGS("lleventcoro") << "postAndWait2(): coroutine " << name
+ // << " about to wait on LLEventPumps " << replyPump0.getPump().getName()
+ // << ", " << replyPump1.getPump().getName() << LL_ENDL;
// trying to dereference ("resolve") the future makes us wait for it
LLEventWithID value(*future);
- LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << name
- << " resuming with (" << value.first << ", " << value.second << ")"
- << LL_ENDL;
+ //LL_DEBUGS("lleventcoro") << "postAndWait(): coroutine " << name
+ // << " resuming with (" << value.first << ", " << value.second << ")"
+ // << LL_ENDL;
// returning should disconnect both connections
return value;
}
diff --git a/indra/llcommon/llprocess.cpp b/indra/llcommon/llprocess.cpp
index 715df36f39..59298366a3 100755
--- a/indra/llcommon/llprocess.cpp
+++ b/indra/llcommon/llprocess.cpp
@@ -81,7 +81,7 @@ public:
// incrementing, listen on "mainloop".
if (mCount++ == 0)
{
- LL_DEBUGS("LLProcess") << "listening on \"mainloop\"" << LL_ENDL;
+ //LL_DEBUGS("LLProcess") << "listening on \"mainloop\"" << LL_ENDL;
mConnection = LLEventPumps::instance().obtain("mainloop")
.listen("LLProcessListener", boost::bind(&LLProcessListener::tick, this, _1));
}
@@ -93,7 +93,7 @@ public:
// stop listening on "mainloop".
if (--mCount == 0)
{
- LL_DEBUGS("LLProcess") << "disconnecting from \"mainloop\"" << LL_ENDL;
+ //LL_DEBUGS("LLProcess") << "disconnecting from \"mainloop\"" << LL_ENDL;
mConnection.disconnect();
}
}
@@ -118,7 +118,7 @@ private:
// centralize such calls, using "mainloop" to ensure it happens once
// per frame, and refcounting running LLProcess objects to remain
// registered only while needed.
- LL_DEBUGS("LLProcess") << "calling apr_proc_other_child_refresh_all()" << LL_ENDL;
+ //LL_DEBUGS("LLProcess") << "calling apr_proc_other_child_refresh_all()" << LL_ENDL;
apr_proc_other_child_refresh_all(APR_OC_REASON_RUNNING);
return false;
}
@@ -216,13 +216,13 @@ public:
remainptr += written;
remainlen -= written;
- char msgbuf[512];
- LL_DEBUGS("LLProcess") << "wrote " << written << " of " << towrite
- << " bytes to " << mDesc
- << " (original " << total << "),"
- << " code " << err << ": "
- << apr_strerror(err, msgbuf, sizeof(msgbuf))
- << LL_ENDL;
+ //char msgbuf[512];
+ //LL_DEBUGS("LLProcess") << "wrote " << written << " of " << towrite
+ // << " bytes to " << mDesc
+ // << " (original " << total << "),"
+ // << " code " << err << ": "
+ // << apr_strerror(err, msgbuf, sizeof(msgbuf))
+ // << LL_ENDL;
// The parent end of this pipe is nonblocking. If we weren't able
// to write everything we wanted, don't keep banging on it -- that
@@ -738,8 +738,7 @@ LLProcess::LLProcess(const LLSDOrParams& params):
{
mPipes.replace(i, new ReadPipeImpl(desc, pipe, FILESLOT(i)));
}
- LL_DEBUGS("LLProcess") << "Instantiating " << typeid(mPipes[i]).name()
- << "('" << desc << "')" << LL_ENDL;
+ LL_DEBUGS("LLProcess") << "Instantiating " << typeid(mPipes[i]).name() << "('" << desc << "')" << LL_ENDL;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-02 07:45:09 +0000