summaryrefslogtreecommitdiff
path: root/indra/newview/llcallingcard.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-05-13 15:47:32 -0700
committerJames Cook <james@lindenlab.com>2010-05-13 15:47:32 -0700
commit8b524549902b780c2833691368bc35bdb1837cd9 (patch)
treeb742a7f5463fb42663fa51e1029c80671ceb881b /indra/newview/llcallingcard.cpp
parent14f423a23c38bf554e9633752074fbcabd92599c (diff)
parentaebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff)
merge pull from dessie/viewer-public, picking up SLE code
Diffstat (limited to 'indra/newview/llcallingcard.cpp')
-rw-r--r--indra/newview/llcallingcard.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llcallingcard.cpp b/indra/newview/llcallingcard.cpp
index b4c4ddcbf4..36de46a367 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -700,6 +700,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
notify = TRUE;
args["NAME"] = full_name;
}
+
}
}
else