summaryrefslogtreecommitdiff
path: root/indra/newview/llagent.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2010-02-17 17:02:26 -0800
committerRichard Linden <none@none>2010-02-17 17:02:26 -0800
commitcf52fc85ae4d06335a09b4dd60bddeb7f66841b3 (patch)
treeafa95f76e9ef3ebe9b91dce90d2a8671f28ab435 /indra/newview/llagent.cpp
parent7c86d4434822d7a3172bed82c3812032089c1518 (diff)
parent9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff)
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
-rw-r--r--indra/newview/llagent.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7929946620..3675be16e9 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -5027,9 +5027,9 @@ void LLAgent::buildFullnameAndTitle(std::string& name) const
}
}
-BOOL LLAgent::isInGroup(const LLUUID& group_id, BOOL ingnore_God_mod /* FALSE */) const
+BOOL LLAgent::isInGroup(const LLUUID& group_id, BOOL ignore_god_mode /* FALSE */) const
{
- if (!ingnore_God_mod && isGodlike())
+ if (!ignore_god_mode && isGodlike())
return true;
S32 count = mGroups.count();