diff options
| author | Rider Linden <rider@lindenlab.com> | 2015-07-15 14:40:35 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2015-07-15 14:40:35 -0700 |
| commit | 9b64867d8bc2fa93d0bdb67fa529690348b67611 (patch) | |
| tree | 815f55150e66183300cb75252009a111fd414936 /indra/newview/llviewerinventory.cpp | |
| parent | 1a6a6c786dcb4164c51734e51a4c86c722835e56 (diff) | |
| parent | 02441157a0d22619ccf2a2ee735c8f5251b54fdb (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rwxr-xr-x | indra/newview/llviewerinventory.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 9a20dea2aa..f6db5d5d77 100755 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -2299,5 +2299,3 @@ BOOL LLViewerInventoryItem::regenerateLink() gInventory.notifyObservers(); return TRUE; } - - |