diff options
| author | Palmer <palmer@lindenlab.com> | 2009-12-08 16:06:18 -0800 |
|---|---|---|
| committer | Palmer <palmer@lindenlab.com> | 2009-12-08 16:06:18 -0800 |
| commit | 7a7eced4a619d98d808abba3f0bf951bcf4cd95a (patch) | |
| tree | 574d0aee2a6cd418af7f84aacfb134fb813b9ec0 /indra/newview/llinventorybridge.cpp | |
| parent | 74f2cb2a70ddad7fe8819fd6855831e0615dc8d5 (diff) | |
Fix of last merge borkasaur. Left off a comma on defining the mesh array. Also switched our mesh icon code to sync with viewer 2 and cleared out extra notification
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 59bfc77723..93cfbddc92 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -125,9 +125,9 @@ std::string ICON_NAME[ICON_NAME_COUNT] = "Inv_Gesture", "Inv_LinkItem", - "Inv_LinkFolder" + "Inv_LinkFolder", - "inv_item_mesh.tga" + "Inv_Mesh" }; // +=================================================+ |