CTS-320 SH-465 FIX use system zlib for standalone builds

pulling boroondas' changes to change our includes to use the system versions
of zlib if doing a standalone build. Code changes are minimal, and appear to
work correctly. Approved. - Nyx

doc/contributions.txt

@@ -170,6 +170,7 @@ Blakar Ogre
 blino Nakamura
 	VWR-17
 Boroondas Gupte
+	CTS-320
 	SNOW-278
 	SNOW-503
 	SNOW-510

indra/llcommon/llsdserialize.cpp

@@ -33,7 +33,12 @@
 
 #include <iostream>
 #include "apr_base64.h"
-#include "zlib/zlib.h"  // for davep's dirty little zip functions
+
+#ifdef LL_STANDALONE
+# include <zlib.h>
+#else
+# include "zlib/zlib.h"  // for davep's dirty little zip functions
+#endif
 
 #if !LL_WINDOWS
 #include <netinet/in.h> // htonl & ntohl

indra/llprimitive/llmodel.cpp

@@ -34,7 +34,13 @@
 #include "dae/daeErrorHandler.h"
 #include "dom/domConstants.h"
 #include "dom/domMesh.h"
-#include "zlib/zlib.h"
+
+#ifdef LL_STANDALONE
+# include <zlib.h>
+#else
+# include "zlib/zlib.h"
+#endif
+
 
 
 std::string model_names[] =