diff options
author | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
---|---|---|
committer | Nyx Linden <nyx@lindenlab.com> | 2013-06-18 16:15:03 -0400 |
commit | 69b062b90889fe581de0d10d60b979cb7883b4a0 (patch) | |
tree | 6286fc967bc0f551a9e67b8377bdfbc743f090b2 /indra/newview/llinspectavatar.cpp | |
parent | c67db8e75511de879c69de0faf06a88ac3cc731d (diff) | |
parent | 425ff28e4bc38ba3f7bfeade4a72dce4eba63b54 (diff) |
merge with viewer-release
Diffstat (limited to 'indra/newview/llinspectavatar.cpp')
-rwxr-xr-x | indra/newview/llinspectavatar.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 9c6db3676f..6ff16742dd 100755 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -292,11 +292,7 @@ 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() { |