From ed0628774ad7abed7572b90564e05660c87fcb4b Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Wed, 4 Dec 2013 01:21:18 +0100 Subject: [PATCH 1/2] Turn noisy AudioEngine debug output into Debug Level. --- indra/llaudio/llaudioengine.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index 6aed74daf..6be8a8042 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -1764,7 +1764,7 @@ void LLAudioData::updateLoadState() if( gAudioDecodeMgrp->addDecodeRequest(getID()) ) { setLoadState(STATE_LOAD_DECODING); - LL_INFOS("AudioEngine") << "Decoding asset data for: " << getID() << LL_ENDL; + LL_DEBUGS("AudioEngine") << "Decoding asset data for: " << getID() << LL_ENDL; } else { @@ -1773,7 +1773,7 @@ void LLAudioData::updateLoadState() } else if(mLoadState == STATE_LOAD_REQ_FETCH && gAssetStorage && gAssetStorage->isUpstreamOK()) { - LL_INFOS("AudioEngine") << "Fetching asset data for: " << getID() << LL_ENDL; + LL_DEBUGS("AudioEngine") << "Fetching asset data for: " << getID() << LL_ENDL; setLoadState(STATE_LOAD_FETCHING); gAssetStorage->getAssetData(getID(), LLAssetType::AT_SOUND, LLAudioEngine::assetCallback, NULL); From 8f2781ca3b8777a48b6de507e5af1ad0749563fa Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Thu, 19 Dec 2013 03:13:33 +0100 Subject: [PATCH 2/2] Fix bug with adding a new grid. --- indra/newview/hippopanelgrids.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/indra/newview/hippopanelgrids.cpp b/indra/newview/hippopanelgrids.cpp index 4057fb1a7..0ee0e217a 100644 --- a/indra/newview/hippopanelgrids.cpp +++ b/indra/newview/hippopanelgrids.cpp @@ -322,6 +322,7 @@ bool HippoPanelGridsImpl::saveCurGrid() mState = NORMAL; mCurGrid = gridname; gridInfo = new HippoGridInfo(gridname); + gridInfo->setLoginUri(loginuri); gHippoGridManager->addGrid(gridInfo); try {