livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7888 FIXED Opening a gesture from an in-world object shows gesture floater with blank information 

EXT-7909 FIXED Cleanup llpreviewgesture #include files

Fixed an issue that was causing gesture asset loading to fail.
Also did header file cleanup.
master
Loren Shih 2010-06-17 11:10:28 -04:00
parent 08515a8eb3
commit 6bbbd6582f
2 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
indra/newview/llpreviewgesture.cpp
View File

@ -31,55 +31,31 @@
*/
#include "llviewerprecompiledheaders.h"
#include "llpreviewgesture.h"
#include <algorithm>
// libraries
#include "lldatapacker.h"
#include "lldarray.h"
#include "llstring.h"
#include "lldir.h"
#include "llagent.h"
#include "llanimstatelabels.h"
#include "llanimationstates.h"
#include "llappviewer.h" // gVFS
#include "llassetuploadresponders.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lldelayedgestureerror.h"
#include "llfloaterreg.h"
#include "llgesturemgr.h"
#include "llinventorydefines.h"
#include "llinventoryfunctions.h"
#include "llinventorymodel.h"
#include "llinventorymodelbackgroundfetch.h"
#include "llmultigesture.h"
#include "llnotificationsutil.h"
#include "llvfile.h"
// newview
#include "llagent.h" // todo: remove
#include "llanimationstates.h"
#include "llassetuploadresponders.h"
#include "llbutton.h"
#include "llcheckboxctrl.h"
#include "llcombobox.h"
#include "lldelayedgestureerror.h"
#include "llfloatergesture.h" // for some label constants
#include "llgesturemgr.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
#include "llradiogroup.h"
#include "llscrolllistctrl.h"
#include "llscrolllistitem.h"
#include "llscrolllistcell.h"
#include "lltextbox.h"
#include "lluictrlfactory.h"
#include "llviewerinventory.h"
#include "llviewerobject.h"
#include "llresmgr.h"
#include "lltrans.h"
#include "llvfile.h"
#include "llviewerobjectlist.h"
#include "llviewerregion.h"
#include "llviewerstats.h"
#include "llviewerwindow.h" // busycount
#include "llvoavatarself.h"
#include "llappviewer.h" // gVFS
#include "llanimstatelabels.h"
#include "llresmgr.h"
#include "lltrans.h"
std::string NONE_LABEL;
std::string SHIFT_LABEL;
@ -832,7 +808,9 @@ void LLPreviewGesture::loadAsset()
const LLInventoryItem* item = getItem();
if (!item)
{
mAssetStatus = PREVIEW_ASSET_ERROR;
// Don't set asset status here; we may not have set the item id yet
// (e.g. when this gets called initially)
//mAssetStatus = PREVIEW_ASSET_ERROR;
return;
}

2
indra/newview/llpreviewgesture.h
View File

@ -34,7 +34,6 @@
#define LL_LLPREVIEWGESTURE_H
#include "llassettype.h"
#include "llmultigesture.h"
#include "llpreview.h"
class LLMultiGesture;
@ -45,7 +44,6 @@ class LLComboBox;
class LLScrollListCtrl;
class LLScrollListItem;
class LLButton;
class LLGestureStep;
class LLRadioGroup;
class LLVFS;