diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-06-18 22:23:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-06-18 22:23:30 -0400 |
| commit | d7400ae60c0453e111357abfb09d8308adf8b721 (patch) | |
| tree | cfbbc175c4df5d0929ad923c5c52489b8d87fb75 /indra/llcommon/llsdserialize.h | |
| parent | d500379cea865e4a6958eee82b5615ace61036c4 (diff) | |
| parent | 9cac312f57391792e9fce380c2c38ae4060ae1d7 (diff) | |
merge to pathfinding development branch
Diffstat (limited to 'indra/llcommon/llsdserialize.h')
| -rw-r--r-- | indra/llcommon/llsdserialize.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h index 99a3ea3cd4..86e3fc864c 100644 --- a/indra/llcommon/llsdserialize.h +++ b/indra/llcommon/llsdserialize.h @@ -793,5 +793,5 @@ public: //dirty little zip functions -- yell at davep LL_COMMON_API std::string zip_llsd(LLSD& data); LL_COMMON_API bool unzip_llsd(LLSD& data, std::istream& is, S32 size); - +LL_COMMON_API U8* unzip_llsdNavMesh( bool& valid, unsigned int& outsize,std::istream& is, S32 size); #endif // LL_LLSDSERIALIZE_H |