From 6f0b9a5f2cb98747715dbfa6c88b86f178c6f94c Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Tue, 23 Apr 2013 21:42:59 -0700
Subject: [PATCH] Avoid unnecessary multimap copies

---
 components/nifogre/ogrenifloader.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/nifogre/ogrenifloader.cpp b/components/nifogre/ogrenifloader.cpp
index e451326fee..57aa794038 100644
--- a/components/nifogre/ogrenifloader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -676,9 +676,8 @@ class NIFObjectLoader
     }
 
 
-    static TextKeyMap extractTextKeys(const Nif::NiTextKeyExtraData *tk)
+    static void extractTextKeys(const Nif::NiTextKeyExtraData *tk, TextKeyMap &textkeys)
     {
-        TextKeyMap textkeys;
         for(size_t i = 0;i < tk->list.size();i++)
         {
             const std::string &str = tk->list[i].text;
@@ -698,7 +697,6 @@ class NIFObjectLoader
                 pos = nextpos;
             }
         }
-        return textkeys;
     }
 
 
@@ -730,7 +728,7 @@ class NIFObjectLoader
                 const Nif::NiTextKeyExtraData *tk = static_cast<const Nif::NiTextKeyExtraData*>(e.getPtr());
 
                 int trgtid = NIFSkeletonLoader::lookupOgreBoneHandle(name, node->recIndex);
-                objectlist.mTextKeys[trgtid] = extractTextKeys(tk);
+                extractTextKeys(tk, objectlist.mTextKeys[trgtid]);
             }
             else if(e->recType == Nif::RC_NiStringExtraData)
             {