diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-05-30 23:51:33 +0000 |
| commit | af8c2bc94868e056908b4ae2fc285925cd68b56b (patch) | |
| tree | 2fc5e74073317ecc3e7b8e64b7c3784e88ba5099 /indra/newview/llinspectavatar.cpp | |
| parent | 2df0a2494691ebfdd305e6a5ee280dd758a1b337 (diff) | |
| parent | dcfb18373eca7986a73d8b9a1d34970cc0a23ed9 (diff) | |
Merge. Pull viewer-release to get the new version scheme changes.
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
| -rwxr-xr-x[-rw-r--r--] | indra/newview/llinspectavatar.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 1e15dc832c..9c6db3676f 100644..100755 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -292,6 +292,11 @@ void LLInspectAvatar::processAvatarData(LLAvatarData* data) delete mPropertiesRequest; mPropertiesRequest = NULL; } +/* +prep# + virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content) + llwarns << "MuteVoiceResponder error [status:" << status << "]: " << content << llendl; + */ void LLInspectAvatar::updateVolumeSlider() { |