From 24b26d71ee01211aa796b8061b66ec06a133e4ce Mon Sep 17 00:00:00 2001
From: Dave Simmons <simon@lindenlab.com>
Date: Fri, 20 Mar 2009 20:00:47 +0000
Subject: svn merge -r113004:115000
 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26 Merge
 latest 1.26 into trunk

---
 indra/llmessage/llcachename.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/llmessage/llcachename.cpp')

diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp
index 776f2b1535..1e6584a085 100644
--- a/indra/llmessage/llcachename.cpp
+++ b/indra/llmessage/llcachename.cpp
@@ -566,6 +566,7 @@ void LLCacheName::get(const LLUUID& id, BOOL is_group, LLCacheNameCallback callb
 	if(id.isNull())
 	{
 		callback(id, CN_NOBODY, "", is_group, user_data);
+		return;
 	}
 
 	LLCacheNameEntry* entry = get_ptr_in_map(impl.mCache, id );
-- 
cgit v1.2.3