summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicechannel.h
diff options
context:
space:
mode:
authorAimee Linden <aimee@lindenlab.com>2010-05-25 03:37:19 +0100
committerAimee Linden <aimee@lindenlab.com>2010-05-25 03:37:19 +0100
commit138f58cf399dc319f90bab46ff72c211327e250d (patch)
tree6e1c6722b7bd9d53cb64e8add2f17d9848d0d5a7 /indra/newview/llvoicechannel.h
parenta146a0f27b3ea2fadaa9e7286645a0944996309d (diff)
parent3e85291fee01680f465198d895d12fef733b146c (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llvoicechannel.h')
-rw-r--r--indra/newview/llvoicechannel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 573fab1f4f..074f9b8bba 100644
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -113,7 +113,7 @@ protected:
void doSetState(const EState& state);
void setURI(std::string uri);
- // there can be two directions ICOMING and OUTGOING
+ // there can be two directions INCOMING and OUTGOING
EDirection mCallDirection;
std::string mURI;