From 2a4dea528f670b9bb1f77ef27a8a1dd16603d114 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Fri, 15 Aug 2008 23:45:50 -0500 Subject: Second Life viewer sources 1.20.7 --- linden/indra/llmath/llvolume.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) (limited to 'linden/indra/llmath/llvolume.h') diff --git a/linden/indra/llmath/llvolume.h b/linden/indra/llmath/llvolume.h index c239685..5b48cfc 100644 --- a/linden/indra/llmath/llvolume.h +++ b/linden/indra/llmath/llvolume.h @@ -52,6 +52,7 @@ class LLVolume; #include "llstrider.h" #include "v4coloru.h" #include "llmemory.h" +#include "llfile.h" //============================================================================ @@ -229,8 +230,8 @@ public: void copyParams(const LLProfileParams ¶ms); - BOOL importFile(FILE *fp); - BOOL exportFile(FILE *fp) const; + BOOL importFile(LLFILE *fp); + BOOL exportFile(LLFILE *fp) const; BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; @@ -354,8 +355,8 @@ public: void copyParams(const LLPathParams ¶ms); - BOOL importFile(FILE *fp); - BOOL exportFile(FILE *fp) const; + BOOL importFile(LLFILE *fp); + BOOL exportFile(LLFILE *fp) const; BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; @@ -545,8 +546,8 @@ public: const LLPathParams &getPathParams() const {return mPathParams;} LLPathParams &getPathParams() {return mPathParams;} - BOOL importFile(FILE *fp); - BOOL exportFile(FILE *fp) const; + BOOL importFile(LLFILE *fp); + BOOL exportFile(LLFILE *fp) const; BOOL importLegacyStream(std::istream& input_stream); BOOL exportLegacyStream(std::ostream& output_stream) const; @@ -760,7 +761,17 @@ public: class LLVolumeFace { public: - LLVolumeFace(); + LLVolumeFace() : + mID(0), + mTypeMask(0), + mHasBinormals(FALSE), + mBeginS(0), + mBeginT(0), + mNumS(0), + mNumT(0) + { + } + BOOL create(LLVolume* volume, BOOL partial_build = FALSE); void createBinormals(); -- cgit v1.1