diff options
| author | Richard Linden <none@none> | 2013-10-08 11:59:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-08 11:59:24 -0700 |
| commit | 80dfbbaacd82179e54163ed48b1bc444e3becbd5 (patch) | |
| tree | da3858b58b5ec9c34d6eefa60c4fe87fc5743249 /indra/newview/llpanelface.h | |
| parent | f7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff) | |
| parent | 2eeee8a9491398697a8f3167bc4f715a3970fc3a (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/llpanelface.h')
| -rwxr-xr-x | indra/newview/llpanelface.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h index b684881225..e32f039921 100755 --- a/indra/newview/llpanelface.h +++ b/indra/newview/llpanelface.h @@ -485,7 +485,7 @@ private: { public: - static void getFace(LLFace*& face_to_return, bool& identical_face); + static void getFace(class LLFace*& face_to_return, bool& identical_face); static void getImageFormat(LLGLenum& image_format_to_return, bool& identical_face); static void getTexId(LLUUID& id, bool& identical); static void getObjectScaleS(F32& scale_s, bool& identical); |