Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-01-12 23:39:16 -05:00
parent b0967463ca 1cc33caaa3
commit 9d3b276f61
37 changed files with 1915 additions and 1554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewermenu.cpp
View File

@@ -170,7 +170,7 @@
#include "llimagej2c.h"
#include "llimagetga.h"
#include "llinventorydefines.h"
#include "llinventorymodel.h"
#include "llinventoryfunctions.h"
#include "llinventoryview.h"
#include "llkeyboard.h"
#include "llpanellogin.h"
@@ -7179,7 +7179,7 @@ class LLAttachmentEnableDrop : public view_listener_t
// if a fetch is already out there (being sent from a slow sim)
// we refetch and there are 2 fetches
LLWornItemFetchedObserver* wornItemFetched = new LLWornItemFetchedObserver();
LLInventoryFetchObserver::item_ref_t items; //add item to the inventory item to be fetched
uuid_vec_t items; //add item to the inventory item to be fetched
items.push_back((*attachment_iter)->getAttachmentItemID());