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

Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer

Browse Source
This commit is contained in:
Latif Khalifa
2013-12-20 04:59:48 +01:00
parent 85c875e856 8f2781ca3b
commit facd5a76c5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llaudio/llaudioengine.cpp
View File

@@ -1764,7 +1764,7 @@ void LLAudioData::updateLoadState()
if( gAudioDecodeMgrp->addDecodeRequest(getID()) ) if( gAudioDecodeMgrp->addDecodeRequest(getID()) )
{ {
setLoadState(STATE_LOAD_DECODING); 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 else
{ {
@@ -1773,7 +1773,7 @@ void LLAudioData::updateLoadState()
} }
else if(mLoadState == STATE_LOAD_REQ_FETCH && gAssetStorage && gAssetStorage->isUpstreamOK()) 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); setLoadState(STATE_LOAD_FETCHING);
gAssetStorage->getAssetData(getID(), LLAssetType::AT_SOUND, LLAudioEngine::assetCallback, NULL); gAssetStorage->getAssetData(getID(), LLAssetType::AT_SOUND, LLAudioEngine::assetCallback, NULL);

1
indra/newview/hippopanelgrids.cpp
View File

@@ -322,6 +322,7 @@ bool HippoPanelGridsImpl::saveCurGrid()
mState = NORMAL; mState = NORMAL;
mCurGrid = gridname; mCurGrid = gridname;
gridInfo = new HippoGridInfo(gridname); gridInfo = new HippoGridInfo(gridname);
gridInfo->setLoginUri(loginuri);
gHippoGridManager->addGrid(gridInfo); gHippoGridManager->addGrid(gridInfo);
try try
{ {