From e3e3fd917f65187b9194d6b167bfa4e23d1b7115 Mon Sep 17 00:00:00 2001 From: Nicky Date: Tue, 10 Jun 2014 13:39:03 +0200 Subject: [PATCH] Post-Merge: make getPartSourceScript() / getPhysicsShapeUnknown() public again. --- indra/newview/llviewerobject.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index d8b88b394a..94629da65b 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -718,10 +718,6 @@ protected: void deleteParticleSource(); void setParticleSource(const LLPartSysData& particle_parameters, const LLUUID& owner_id); - // export - LLViewerPartSourceScript* getPartSourceScript() { return mPartSourcep.get(); } - bool getPhysicsShapeUnknown () { return mPhysicsShapeUnknown; } - // private: void setNameValueList(const std::string& list); // clears nv pairs and then individually adds \n separated NV pairs from \0 terminated string void deleteTEImages(); // correctly deletes list of images @@ -835,6 +831,12 @@ private: LLUUID mAttachmentItemID; // ItemID of the associated object is in user inventory. EObjectUpdateType mLastUpdateType; BOOL mLastUpdateCached; + + // export +public: + LLViewerPartSourceScript* getPartSourceScript() { return mPartSourcep.get(); } + bool getPhysicsShapeUnknown () { return mPhysicsShapeUnknown; } + // }; ///////////////////