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

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

Browse Source 
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
This commit is contained in:
Inusaito Sayori
2015-06-19 05:42:49 -04:00
parent 2bd2a7a64b 1c627317ec
commit b11511b7b9
634 changed files with 8198 additions and 12212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
indra/newview/llgesturemgr.cpp
View File

@@ -263,19 +263,19 @@ void LLGestureMgr::activateGestureWithAsset(const LLUUID& item_id,
if( !gAssetStorage )
{
llwarns << "LLGestureMgr::activateGestureWithAsset without valid gAssetStorage" << llendl;
LL_WARNS() << "LLGestureMgr::activateGestureWithAsset without valid gAssetStorage" << LL_ENDL;
return;
}
// If gesture is already active, nothing to do.
if (isGestureActive(base_item_id))
{
llwarns << "Tried to loadGesture twice " << base_item_id << llendl;
LL_WARNS() << "Tried to loadGesture twice " << base_item_id << LL_ENDL;
return;
}
// if (asset_id.isNull())
// {
// llwarns << "loadGesture() - gesture has no asset" << llendl;
// LL_WARNS() << "loadGesture() - gesture has no asset" << LL_ENDL;
// return;
// }
@@ -311,7 +311,7 @@ void LLGestureMgr::deactivateGesture(const LLUUID& item_id)
item_map_t::iterator it = mActive.find(base_item_id);
if (it == mActive.end())
{
llwarns << "deactivateGesture for inactive gesture " << base_item_id << llendl;
LL_WARNS() << "deactivateGesture for inactive gesture " << base_item_id << LL_ENDL;
return;
}
@@ -473,7 +473,7 @@ void LLGestureMgr::replaceGesture(const LLUUID& item_id, LLMultiGesture* new_ges
item_map_t::iterator it = mActive.find(base_item_id);
if (it == mActive.end())
{
llwarns << "replaceGesture for inactive gesture " << base_item_id << llendl;
LL_WARNS() << "replaceGesture for inactive gesture " << base_item_id << LL_ENDL;
return;
}
@@ -515,7 +515,7 @@ void LLGestureMgr::replaceGesture(const LLUUID& item_id, const LLUUID& new_asset
item_map_t::iterator it = LLGestureMgr::instance().mActive.find(base_item_id);
if (it == mActive.end())
{
llwarns << "replaceGesture for inactive gesture " << base_item_id << llendl;
LL_WARNS() << "replaceGesture for inactive gesture " << base_item_id << LL_ENDL;
return;
}
@@ -598,7 +598,7 @@ void LLGestureMgr::playGesture(LLMultiGesture* gesture, bool local)
}
default:
{
llwarns << "Unknown gesture step type: " << step->getType() << llendl;
LL_WARNS() << "Unknown gesture step type: " << step->getType() << LL_ENDL;
}
}
}
@@ -926,8 +926,8 @@ void LLGestureMgr::stepGesture(LLMultiGesture* gesture)
else if (gesture->mWaitTimer.getElapsedTimeF32() > MAX_WAIT_ANIM_SECS)
{
// we've waited too long for an animation
llinfos << "Waited too long for animations to stop, continuing gesture."
<< llendl;
LL_INFOS() << "Waited too long for animations to stop, continuing gesture."
<< LL_ENDL;
gesture->mWaitingAnimations = FALSE;
gesture->mCurrentStep++;
}
@@ -1100,7 +1100,7 @@ void LLGestureMgr::onLoadComplete(LLVFS *vfs,
char* buffer = new char[size+1];
if (buffer == NULL)
{
llerrs << "Memory Allocation Failed" << llendl;
LL_ERRS() << "Memory Allocation Failed" << LL_ENDL;
return;
}
@@ -1175,7 +1175,7 @@ void LLGestureMgr::onLoadComplete(LLVFS *vfs,
}
else
{
llwarns << "Unable to load gesture" << llendl;
LL_WARNS() << "Unable to load gesture" << LL_ENDL;
self.mActive.erase(item_id);
@@ -1200,7 +1200,7 @@ void LLGestureMgr::onLoadComplete(LLVFS *vfs,
LLDelayedGestureError::gestureFailedToLoad( item_id );
}
llwarns << "Problem loading gesture: " << status << llendl;
LL_WARNS() << "Problem loading gesture: " << status << LL_ENDL;
LLGestureMgr::instance().mActive.erase(item_id);
}
@@ -1236,7 +1236,7 @@ void LLGestureMgr::onAssetLoadComplete(LLVFS *vfs,
}
default:
{
llwarns << "Unexpected asset type: " << type << llendl;
LL_WARNS() << "Unexpected asset type: " << type << LL_ENDL;
// We don't want to return from this callback without
// an animation or sound callback being fired
@@ -1291,7 +1291,7 @@ bool LLGestureMgr::hasLoadingAssets(LLMultiGesture* gesture)
}
default:
{
llwarns << "Unknown gesture step type: " << step->getType() << llendl;
LL_WARNS() << "Unknown gesture step type: " << step->getType() << LL_ENDL;
}
}
}
@@ -1375,7 +1375,7 @@ void LLGestureMgr::removeObserver(LLGestureManagerObserver* observer)
// from the list.
void LLGestureMgr::notifyObservers()
{
lldebugs << "LLGestureMgr::notifyObservers" << llendl;
LL_DEBUGS() << "LLGestureMgr::notifyObservers" << LL_ENDL;
for(std::vector<LLGestureManagerObserver*>::iterator iter = mObservers.begin();
iter != mObservers.end();