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

Sync with obsidian in attempt to fix SV-2086

Browse Source 
Applies MAINT-4897 FIXED Frequent error when texturing a linkset - "Unable to add texture. Please wait a few seconds and try again."
Applies MAINT-5547 FIXED errors when texturing a linkset "Unable to add texture. Please wait a few seconds and try again."
This commit is contained in:
Lirusaito
2016-07-07 16:37:25 -04:00
parent a6e905020d
commit 873b399ee8
3 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
indra/newview/llviewerobject.h
View File

@@ -54,27 +54,27 @@ class LLAgent; // TODO: Get rid of this.
class LLAudioSource;
class LLAudioSourceVO;
class LLBBox;
class LLDataPacker;
class LLColor4;
class LLFrameTimer;
class LLDataPacker;
class LLDrawable;
class LLFrameTimer;
class LLHost;
class LLWorld;
class LLMessageSystem;
class LLNameValue;
class LLNetMap;
class LLMessageSystem;
class LLPartSysData;
class LLPrimitive;
class LLPipeline;
class LLPrimitive;
class LLTextureEntry;
class LLViewerTexture;
class LLVOAvatar;
class LLVOInventoryListener;
class LLViewerInventoryItem;
class LLViewerObject;
class LLViewerObjectMedia;
class LLViewerPartSourceScript;
class LLViewerRegion;
class LLViewerObjectMedia;
class LLVOInventoryListener;
class LLVOAvatar;
class LLViewerTexture;
class LLWorld;
typedef enum e_object_update_type
{
@@ -112,7 +112,7 @@ struct PotentialReturnableObject
//============================================================================
class LLViewerObject : public LLPrimitive, public LLRefCount, public LLGLUpdate
class LLViewerObject: public LLPrimitive, public LLRefCount, public LLGLUpdate
{
protected:
~LLViewerObject(); // use unref()
@@ -446,8 +446,8 @@ public:
void removeInventoryListener(LLVOInventoryListener* listener);
BOOL isInventoryPending() { return mInventoryPending; }
void clearInventoryListeners();
bool hasInventoryListeners();
void requestInventory();
void fetchInventoryFromServer();
static void processTaskInv(LLMessageSystem* msg, void** user_data);
void removeInventory(const LLUUID& item_id);
@@ -595,6 +595,9 @@ private:
// Motion prediction between updates
void interpolateLinearMotion(const F64SecondsImplicit & time, const F32SecondsImplicit & dt);
// forms task inventory request if none are pending
void fetchInventoryFromServer();
public:
//
// Viewer-side only types - use the LL_PCODE_APP mask.