summaryrefslogtreecommitdiff
path: root/indra/newview/llcallingcard.cpp
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-19 16:24:05 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-19 16:24:05 -0700
commit8d8f167a4e58583c55901448a7bc5dd88b60e5f7 (patch)
treeb4c71519c8d9ae0fd1addece5ea1f1424ded313f /indra/newview/llcallingcard.cpp
parent7f0a7789903809d489e9f85575be18c88df1ea98 (diff)
parentb55bce5b1b74c612f3a411889df1e0fb57bc3264 (diff)
automated merge with trunk
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 79a2631c31..1a6c11fa73 100644
--- a/indra/newview/llcallingcard.cpp
+++ b/indra/newview/llcallingcard.cpp
@@ -700,6 +700,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online)
args["FIRST"] = first;
args["LAST"] = last;
}
+
}
}
else