diff options
| author | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
|---|---|---|
| committer | Chris Baker <baker@lindenlab.com> | 2014-06-16 21:15:41 +0000 |
| commit | ee14005a2aea89b2988fa0a5060f38b669e45389 (patch) | |
| tree | 3b9930089be344a9c25172f3ca4be0fbf412ba17 /indra/llappearance/llviewervisualparam.h | |
| parent | a92dbb592b338f48f7b75b68a9da511dc95279f9 (diff) | |
| parent | 977476171ddcc057d7c28b6c14ae988b8189ed75 (diff) | |
viewer-release merge
Diffstat (limited to 'indra/llappearance/llviewervisualparam.h')
| -rw-r--r-- | indra/llappearance/llviewervisualparam.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llappearance/llviewervisualparam.h b/indra/llappearance/llviewervisualparam.h index 2826e6c316..1a710c0ca6 100644 --- a/indra/llappearance/llviewervisualparam.h +++ b/indra/llappearance/llviewervisualparam.h @@ -70,7 +70,7 @@ class LLViewerVisualParam : public LLVisualParam { public: LLViewerVisualParam(); - /*virtual*/ ~LLViewerVisualParam(){}; + virtual ~LLViewerVisualParam(); // Special: These functions are overridden by child classes LLViewerVisualParamInfo *getInfo() const { return (LLViewerVisualParamInfo*)mInfo; }; @@ -105,6 +105,8 @@ public: BOOL getCrossWearable() const { return getInfo()->mCrossWearable; } +protected: + LLViewerVisualParam(const LLViewerVisualParam& pOther); } LL_ALIGN_POSTFIX(16); #endif // LL_LLViewerVisualParam_H |