[sldev] [VIEWER] 64 bit status and open source components
David Fries
david at fries.net
Fri Sep 14 05:37:55 PDT 2007
I have the viewer compiled and running in 64 bit mode on an x86_64
with Debian. There are a couple libraries required that don't come
with the distribution that you have to compile yourself, but ignore
all the build steps about copying (shudder) system include/library
files to the source tree and apply the included patch. That lets it
reference the system include files the way the are supposed to be
included.
It does compile and run as a 64 bit binary, though people occasionally
break things.
On Fri, Sep 14, 2007 at 01:08:17PM +0100, Robin Cornelius wrote:
> Hi Everyone,
>
> Sorry if this is documented some where, if so then please just send me there :-)
>
> Whats the current code base staus wrt 64 bit systems. Is it capable of
> being compiled for an Athlon 64 (specifically on linux in this
> instance)? and what about the libs as well, as i will of cause need
> 64bit libs as well. I don't mind loosing fmod as it dosn't work too
> well for me at the best of times.
>
> Whist i remember, i saw a while ago a message saying the viewer had
> been compiled completely with open source components including all the
> gstreamer stuff. All i remember was that this is done internally by
> the Lindens but i have not seen anything else about this since.
>
> Thanks,
>
>
> Robin
> _______________________________________________
> Click here to unsubscribe or manage your list subscription:
> /index.html
--
David Fries <david at fries.net>
http://fries.net/~david/ (PGP encryption key available)
-------------- next part --------------
Index: indra/SConstruct
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/SConstruct,v
retrieving revision 1.10
retrieving revision 1.2.2.11
diff -u -p -w -r1.10 -r1.2.2.11
--- indra/SConstruct 18 Jul 2007 00:32:05 -0000 1.10
+++ indra/SConstruct 18 Jul 2007 00:33:07 -0000 1.2.2.11
@@ -194,7 +194,7 @@ for build_target in targets:
if arch == 'x86_64' and os.path.exists('/usr/lib64'):
client_external_libs = [File('/usr/lib64/libresolv.a')]
else:
- client_external_libs = ['llresolv6']
+ client_external_libs = [File('/usr/lib/libresolv.a')]
else:
client_external_libs = ['resolv']
@@ -262,21 +262,9 @@ for build_target in targets:
cppflags += '-DAPPID=secondlife -DLL_SDL=1 '
if arch == 'x86_64' or arch == 'x86_64cross' or not enable_fmod:
cppflags += '-DLL_FMOD=0 '
+ cppflags += '-DLL_FMOD=0 '
cppflags += '-DLL_X11=1 -DLL_GTK=1 '
- if standalone:
- include_dirs += [d[2:] for d in
- pkgconfig('--cflags-only-I').split()]
- else:
- client_external_libs += [ 'gtk-x11-2.0' ]
- incdirs = [ 'ELFIO', 'atk-1.0', 'glib-2.0', 'gtk-2.0',
- 'llfreetype2', 'pango-1.0' ]
- include_dirs += ['../libraries/' + system_str + '/include/' + d
- for d in incdirs]
-
- if elfio:
- client_external_libs += [ 'elfio' ]
- else:
- cppflags += '-DLL_ELFBIN=0 '
+ client_external_libs += [ 'gtk-x11-2.0', 'ELFIO' ]
# llmozlib stuff
if enable_mozlib:
@@ -363,6 +351,11 @@ for build_target in targets:
LIBPATH = lib_path,
LINKFLAGS = system_link_flags + '--no-keep-memory --reduce-memory-overheads ' )
+ # Add include and library paths.
+ base_env.ParseConfig('pkg-config --cflags gtk+-2.0');
+ # gtk-config --cflags');
+ base_env.ParseConfig('freetype-config --cflags');
+
### Environments for various build types ###
env = base_env.Copy(CFLAGS=releasefordownload_cflags,
@@ -578,8 +571,8 @@ for build_target in targets:
if arch != 'x86_64' and arch != 'x86_64cross':
if enable_fmod:
external_libs += [ 'fmod-3.75' ]
- if buildtype == 'debug':
- external_libs += ['tcmalloc', 'stacktrace']
+ #if buildtype == 'debug':
+ #external_libs += ['tcmalloc', 'stacktrace']
external_libs.remove('cares')
Index: indra/llcommon/llapr.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llcommon/llapr.h,v
retrieving revision 1.3
retrieving revision 1.1.2.3
diff -u -p -w -r1.3 -r1.1.2.3
--- indra/llcommon/llapr.h 9 Jul 2007 00:12:04 -0000 1.3
+++ indra/llcommon/llapr.h 9 Jul 2007 00:19:49 -0000 1.1.2.3
@@ -37,11 +37,11 @@
#include <boost/noncopyable.hpp>
-#include "apr-1/apr_thread_proc.h"
-#include "apr-1/apr_thread_mutex.h"
-#include "apr-1/apr_getopt.h"
-#include "apr-1/apr_signal.h"
-#include "apr-1/apr_atomic.h"
+#include <apr-1.0/apr_thread_proc.h>
+#include <apr-1.0/apr_thread_mutex.h>
+#include <apr-1.0/apr_getopt.h>
+#include <apr-1.0/apr_signal.h>
+#include <apr-1.0/apr_atomic.h>
#include "llstring.h"
Index: indra/llcommon/llbase64.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llcommon/llbase64.cpp,v
retrieving revision 1.3
retrieving revision 1.1.2.3
diff -u -p -w -r1.3 -r1.1.2.3
--- indra/llcommon/llbase64.cpp 13 May 2007 01:26:21 -0000 1.3
+++ indra/llcommon/llbase64.cpp 13 May 2007 02:06:43 -0000 1.1.2.3
@@ -33,7 +33,7 @@
#include <string>
-#include "apr-1/apr_base64.h"
+#include <apr-1.0/apr_base64.h>
// static
@@ -60,4 +60,3 @@ std::string LLBase64::encode(const U8* i
}
return output;
}
-
Index: indra/llcommon/lldate.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llcommon/lldate.cpp,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llcommon/lldate.cpp 13 May 2007 01:26:21 -0000 1.2
+++ indra/llcommon/lldate.cpp 13 May 2007 02:06:43 -0000 1.1.2.2
@@ -31,7 +31,7 @@
#include "linden_common.h"
#include "lldate.h"
-#include "apr-1/apr_time.h"
+#include <apr-1.0/apr_time.h>
#include <iomanip>
#include <sstream>
Index: indra/llcommon/llsdserialize.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llcommon/llsdserialize.cpp,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llcommon/llsdserialize.cpp 13 May 2007 01:26:21 -0000 1.2
+++ indra/llcommon/llsdserialize.cpp 13 May 2007 02:06:43 -0000 1.1.2.2
@@ -34,7 +34,7 @@
#include "llstreamtools.h" // for fullread
#include <iostream>
-#include "apr-1/apr_base64.h"
+#include <apr-1.0/apr_base64.h>
#if !LL_WINDOWS
#include <netinet/in.h> // htonl & ntohl
Index: indra/llcommon/llsdserialize_xml.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llcommon/llsdserialize_xml.cpp,v
retrieving revision 1.4
retrieving revision 1.1.2.4
diff -u -p -w -r1.4 -r1.1.2.4
--- indra/llcommon/llsdserialize_xml.cpp 9 Jul 2007 00:12:04 -0000 1.4
+++ indra/llcommon/llsdserialize_xml.cpp 9 Jul 2007 00:19:49 -0000 1.1.2.4
@@ -32,11 +32,11 @@
#include <iostream>
#include <deque>
-#include "apr-1/apr_base64.h"
+#include <apr-1.0/apr_base64.h>
extern "C"
{
-#include "expat/expat.h"
+#include <expat.h>
}
/**
Index: indra/llcommon/llsys.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llcommon/llsys.cpp,v
retrieving revision 1.4
retrieving revision 1.1.2.4
diff -u -p -w -r1.4 -r1.1.2.4
--- indra/llcommon/llsys.cpp 18 Jul 2007 00:32:05 -0000 1.4
+++ indra/llcommon/llsys.cpp 18 Jul 2007 00:33:07 -0000 1.1.2.4
@@ -31,7 +31,7 @@
#include "llsys.h"
#include <iostream>
-#include <zlib/zlib.h>
+#include <zlib.h>
#include "processor.h"
Index: indra/llcommon/llthread.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llcommon/llthread.h,v
retrieving revision 1.3
retrieving revision 1.1.2.3
diff -u -p -w -r1.3 -r1.1.2.3
--- indra/llcommon/llthread.h 9 Jul 2007 00:12:04 -0000 1.3
+++ indra/llcommon/llthread.h 9 Jul 2007 00:19:49 -0000 1.1.2.3
@@ -33,7 +33,7 @@
#include "llapp.h"
#include "llmemory.h"
-#include "apr-1/apr_thread_cond.h"
+#include <apr-1.0/apr_thread_cond.h>
class LLThread;
class LLMutex;
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llimage/llimagej2c.cpp,v
retrieving revision 1.5
retrieving revision 1.3.2.2
diff -u -p -w -r1.5 -r1.3.2.2
--- indra/llimage/llimagej2c.cpp 13 May 2007 01:26:22 -0000 1.5
+++ indra/llimage/llimagej2c.cpp 13 May 2007 02:06:43 -0000 1.3.2.2
@@ -26,12 +26,18 @@
*/
#include "linden_common.h"
-#include <apr-1/apr_pools.h>
-#include <apr-1/apr_dso.h>
+#include <apr-1.0/apr_pools.h>
+#include <apr-1.0/apr_dso.h>
#include "lldir.h"
#include "llimagej2c.h"
#include "llmemtype.h"
+#include "llthread.h"
+#include "lltimer.h"
+
+#include <map>
+#include <sstream>
+#include <fstream>
typedef LLImageJ2CImpl* (*CreateLLImageJ2CFunction)();
typedef void (*DestroyLLImageJ2CFunction)(LLImageJ2CImpl*);
Index: indra/llimage/llimagejpeg.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llimage/llimagejpeg.h,v
retrieving revision 1.5
retrieving revision 1.3.2.2
diff -u -p -w -r1.5 -r1.3.2.2
--- indra/llimage/llimagejpeg.h 13 May 2007 01:26:22 -0000 1.5
+++ indra/llimage/llimagejpeg.h 13 May 2007 02:06:43 -0000 1.3.2.2
@@ -34,8 +34,8 @@
#include "llimage.h"
extern "C" {
-#include "jpeglib/jpeglib.h"
-#include "jpeglib/jerror.h"
+#include <jpeglib.h>
+#include <jerror.h>
}
class LLImageJPEG : public LLImageFormatted
Index: indra/llimagej2coj/llimagej2coj.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llimagej2coj/llimagej2coj.cpp,v
retrieving revision 1.12
retrieving revision 1.9.2.4
diff -u -p -w -r1.12 -r1.9.2.4
--- indra/llimagej2coj/llimagej2coj.cpp 13 May 2007 01:26:22 -0000 1.12
+++ indra/llimagej2coj/llimagej2coj.cpp 13 May 2007 02:06:44 -0000 1.9.2.4
@@ -31,7 +31,7 @@
// this is defined so that we get static linking.
#define OPJ_STATIC
-#include "openjpeg/openjpeg.h"
+#include <openjpeg.h>
#include "lltimer.h"
#include "llmemory.h"
Index: indra/llmessage/llfiltersd2xmlrpc.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/llfiltersd2xmlrpc.cpp,v
retrieving revision 1.3
retrieving revision 1.1.2.3
diff -u -p -w -r1.3 -r1.1.2.3
--- indra/llmessage/llfiltersd2xmlrpc.cpp 13 May 2007 01:26:22 -0000 1.3
+++ indra/llmessage/llfiltersd2xmlrpc.cpp 13 May 2007 02:06:44 -0000 1.1.2.3
@@ -77,8 +77,8 @@
#include <sstream>
#include <iterator>
-#include <xmlrpc-epi/xmlrpc.h>
-#include "apr-1/apr_base64.h"
+#include <xmlrpc.h>
+#include <apr-1.0/apr_base64.h>
#include "llbuffer.h"
#include "llbufferstream.h"
Index: indra/llmessage/llhttpassetstorage.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/llhttpassetstorage.cpp,v
retrieving revision 1.5
retrieving revision 1.1.2.5
diff -u -p -w -r1.5 -r1.1.2.5
--- indra/llmessage/llhttpassetstorage.cpp 9 Jul 2007 00:12:04 -0000 1.5
+++ indra/llmessage/llhttpassetstorage.cpp 9 Jul 2007 00:19:49 -0000 1.1.2.5
@@ -38,7 +38,7 @@
#include "llvfile.h"
#include "llvfs.h"
-#include "zlib/zlib.h"
+#include <zlib.h>
const U32 MAX_RUNNING_REQUESTS = 1;
const F32 MAX_PROCESSING_TIME = 0.005f;
Index: indra/llmessage/lliopipe.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/lliopipe.h,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llmessage/lliopipe.h 13 May 2007 01:26:22 -0000 1.2
+++ indra/llmessage/lliopipe.h 13 May 2007 02:06:44 -0000 1.1.2.2
@@ -33,7 +33,7 @@
#include <boost/intrusive_ptr.hpp>
#include <boost/shared_ptr.hpp>
-#include "apr-1/apr_poll.h"
+#include <apr-1.0/apr_poll.h>
#include "llsd.h"
Index: indra/llmessage/lliosocket.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/lliosocket.h,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llmessage/lliosocket.h 13 May 2007 01:26:22 -0000 1.2
+++ indra/llmessage/lliosocket.h 13 May 2007 02:06:44 -0000 1.1.2.2
@@ -40,8 +40,8 @@
*/
#include "lliopipe.h"
-#include "apr-1/apr_pools.h"
-#include "apr-1/apr_network_io.h"
+#include <apr-1.0/apr_pools.h>
+#include <apr-1.0/apr_network_io.h>
#include "llchainio.h"
class LLHost;
Index: indra/llmessage/llmail.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/llmail.cpp,v
retrieving revision 1.5
retrieving revision 1.1.2.5
diff -u -p -w -r1.5 -r1.1.2.5
--- indra/llmessage/llmail.cpp 27 May 2007 22:05:41 -0000 1.5
+++ indra/llmessage/llmail.cpp 27 May 2007 22:10:14 -0000 1.1.2.5
@@ -41,8 +41,8 @@
#include <sstream>
#include <boost/regex.hpp>
-#include "apr-1/apr_pools.h"
-#include "apr-1/apr_network_io.h"
+#include <apr-1.0/apr_pools.h>
+#include <apr-1.0/apr_network_io.h>
#include "llapr.h"
#include "llbase32.h" // IM-to-email address
Index: indra/llmessage/llpumpio.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/llpumpio.cpp,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llmessage/llpumpio.cpp 13 May 2007 01:26:22 -0000 1.2
+++ indra/llmessage/llpumpio.cpp 13 May 2007 02:06:44 -0000 1.1.2.2
@@ -32,7 +32,7 @@
#include "llpumpio.h"
#include <set>
-#include "apr-1/apr_poll.h"
+#include <apr-1.0/apr_poll.h>
#include "llapr.h"
#include "llmemtype.h"
Index: indra/llmessage/llpumpio.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/llpumpio.h,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llmessage/llpumpio.h 13 May 2007 01:26:22 -0000 1.2
+++ indra/llmessage/llpumpio.h 13 May 2007 02:06:44 -0000 1.1.2.2
@@ -36,7 +36,7 @@
#include <sys/param.h>
#endif
-#include "apr-1/apr_pools.h"
+#include <apr-1.0/apr_pools.h>
#include "llbuffer.h"
#include "llframetimer.h"
#include "lliopipe.h"
Index: indra/llmessage/message.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llmessage/message.cpp,v
retrieving revision 1.6
retrieving revision 1.1.2.6
diff -u -p -w -r1.6 -r1.1.2.6
--- indra/llmessage/message.cpp 18 Jul 2007 00:32:05 -0000 1.6
+++ indra/llmessage/message.cpp 18 Jul 2007 00:33:07 -0000 1.1.2.6
@@ -47,9 +47,9 @@
#include <sstream>
#include "llapr.h"
-#include "apr-1/apr_portable.h"
-#include "apr-1/apr_network_io.h"
-#include "apr-1/apr_poll.h"
+#include <apr-1.0/apr_portable.h>
+#include <apr-1.0/apr_network_io.h>
+#include <apr-1.0/apr_poll.h>
// linden library headers
#include "indra_constants.h"
Index: indra/llrender/llfont.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llrender/llfont.cpp,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llrender/llfont.cpp 13 May 2007 01:26:22 -0000 1.2
+++ indra/llrender/llfont.cpp 13 May 2007 02:06:44 -0000 1.1.2.2
@@ -31,11 +31,7 @@
#include "llfont.h"
// Freetype stuff
-#if LL_LINUX // I had to do some work to avoid the system-installed FreeType headers... --ryan.
-#include "llfreetype2/freetype/ft2build.h"
-#else
#include <ft2build.h>
-#endif
// For some reason, this won't work if it's not wrapped in the ifdef
#ifdef FT_FREETYPE_H
Index: indra/llwindow/llwindowsdl.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llwindow/llwindowsdl.cpp,v
retrieving revision 1.5
retrieving revision 1.1.2.5
diff -u -p -w -r1.5 -r1.1.2.5
--- indra/llwindow/llwindowsdl.cpp 9 Jul 2007 00:12:04 -0000 1.5
+++ indra/llwindow/llwindowsdl.cpp 9 Jul 2007 00:19:49 -0000 1.1.2.5
@@ -556,6 +556,13 @@ BOOL LLWindowSDL::createContext(int x, i
}
mWindow = SDL_SetVideoMode(width, height, bits, sdlflags | SDL_FULLSCREEN);
+ if (!mWindow)
+ {
+ llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl;
+ llwarns << "createContext: Trying again with 16 bit depth buffer" << llendl;
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+ mWindow = SDL_SetVideoMode(width, height, bits, sdlflags);
+ }
if (mWindow)
{
@@ -598,6 +605,13 @@ BOOL LLWindowSDL::createContext(int x, i
llinfos << "createContext: creating window " << width << "x" << height << "x" << bits << llendl;
mWindow = SDL_SetVideoMode(width, height, bits, sdlflags);
+ if (!mWindow)
+ {
+ llwarns << "createContext: window creation failure. SDL: " << SDL_GetError() << llendl;
+ llwarns << "createContext: Trying again with 16 bit depth buffer" << llendl;
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+ mWindow = SDL_SetVideoMode(width, height, bits, sdlflags);
+ }
if (!mWindow)
{
Index: indra/llxml/llxmlnode.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llxml/llxmlnode.h,v
retrieving revision 1.3
retrieving revision 1.1.2.3
diff -u -p -w -r1.3 -r1.1.2.3
--- indra/llxml/llxmlnode.h 9 Jul 2007 00:12:04 -0000 1.3
+++ indra/llxml/llxmlnode.h 9 Jul 2007 00:19:49 -0000 1.1.2.3
@@ -30,7 +30,7 @@
#define LL_LLXMLNODE_H
#define XML_STATIC
-#include "expat/expat.h"
+#include <expat.h>
#include <map>
#include "indra_constants.h"
Index: indra/llxml/llxmlparser.h
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/llxml/llxmlparser.h,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/llxml/llxmlparser.h 13 May 2007 01:26:22 -0000 1.2
+++ indra/llxml/llxmlparser.h 13 May 2007 02:06:44 -0000 1.1.2.2
@@ -30,7 +30,7 @@
#define LL_LLXMLPARSER_H
#define XML_STATIC
-#include "expat/expat.h"
+#include <expat.h>
class LLXmlParser
{
Index: indra/newview/lluserauth.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/newview/lluserauth.cpp,v
retrieving revision 1.2
retrieving revision 1.1.2.2
diff -u -p -w -r1.2 -r1.1.2.2
--- indra/newview/lluserauth.cpp 13 May 2007 01:26:22 -0000 1.2
+++ indra/newview/lluserauth.cpp 13 May 2007 02:06:45 -0000 1.1.2.2
@@ -42,7 +42,7 @@
// NOTE: MUST include these after otherincludes since queue gets redefined!?!!
#include <curl/curl.h>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
Index: indra/newview/llviewerobjectlist.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/newview/llviewerobjectlist.cpp,v
retrieving revision 1.4
retrieving revision 1.1.2.4
diff -u -p -w -r1.4 -r1.1.2.4
--- indra/newview/llviewerobjectlist.cpp 13 May 2007 01:26:22 -0000 1.4
+++ indra/newview/llviewerobjectlist.cpp 13 May 2007 02:06:45 -0000 1.1.2.4
@@ -61,7 +61,7 @@
#include "u64.h"
#include "llviewerimagelist.h"
#include "lldatapacker.h"
-#include <zlib/zlib.h>
+#include <zlib.h>
#include "object_flags.h"
extern BOOL gVelocityInterpolate;
Index: indra/newview/llviewerparcelmgr.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/newview/llviewerparcelmgr.cpp,v
retrieving revision 1.12
retrieving revision 1.5.2.6
diff -u -p -w -r1.12 -r1.5.2.6
--- indra/newview/llviewerparcelmgr.cpp 18 Jul 2007 00:32:05 -0000 1.12
+++ indra/newview/llviewerparcelmgr.cpp 18 Jul 2007 00:33:07 -0000 1.5.2.6
@@ -181,7 +181,7 @@ LLViewerParcelMgr::~LLViewerParcelMgr()
mCollisionSegments = NULL;
// weird, this crashes if I use an array delete on it!
- delete sPackedOverlay;
+ delete[] sPackedOverlay;
sPackedOverlay = NULL;
delete[] mAgentParcelOverlay;
Index: indra/newview/llxmlrpctransaction.cpp
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/newview/llxmlrpctransaction.cpp,v
retrieving revision 1.5
retrieving revision 1.1.2.5
diff -u -p -w -r1.5 -r1.1.2.5
--- indra/newview/llxmlrpctransaction.cpp 9 Jul 2007 00:12:04 -0000 1.5
+++ indra/newview/llxmlrpctransaction.cpp 9 Jul 2007 00:19:49 -0000 1.1.2.5
@@ -34,7 +34,7 @@
// Have to include these last to avoid queue redefinition!
#include <curl/curl.h>
-#include <xmlrpc-epi/xmlrpc.h>
+#include <xmlrpc.h>
#include "viewer.h"
Index: indra/newview/linux_tools/client-manifest-i686
===================================================================
RCS file: /home/david/src/.cvs/programming/SecondLife/linden/indra/newview/linux_tools/client-manifest-i686,v
retrieving revision 1.4
retrieving revision 1.2.2.1
diff -u -p -w -r1.4 -r1.2.2.1
--- indra/newview/linux_tools/client-manifest-i686 24 Feb 2007 18:30:21 -0000 1.4
+++ indra/newview/linux_tools/client-manifest-i686 24 Feb 2007 18:40:31 -0000 1.2.2.1
@@ -33,20 +33,20 @@ help/
skins/
res-sdl/
../../scripts/messages/message_template.msg,app_settings/message_template.msg
-#../../libraries/i686-linux/lib_release_client/libkdu_v42R.so,lib/libkdu_v42R.so
-../../libraries/i686-linux/lib_release_client/libfmod-3.75.so,lib/libfmod-3.75.so
-../../libraries/i686-linux/lib_release_client/libapr-1.so.0,lib/libapr-1.so.0
-../../libraries/i686-linux/lib_release_client/libaprutil-1.so.0,lib/libaprutil-1.so.0
-../../libraries/i686-linux/lib_release_client/libdb-4.2.so,lib/libdb-4.2.so
-../../libraries/i686-linux/lib_release_client/libogg.so.0,lib/libogg.so.0
-../../libraries/i686-linux/lib_release_client/libvorbis.so.0,lib/libvorbis.so.0
-../../libraries/i686-linux/lib_release_client/libvorbisfile.so.0,lib/libvorbisfile.so.0
-../../libraries/i686-linux/lib_release_client/libvorbisenc.so.0,lib/libvorbisenc.so.0
-../../libraries/i686-linux/lib_release_client/libcurl.so.4,lib/libcurl.so.4
-../../libraries/i686-linux/lib_release_client/libcrypto.so.0.9.7,lib/libcrypto.so.0.9.7
-../../libraries/i686-linux/lib_release_client/libssl.so.0.9.7,lib/libssl.so.0.9.7
-../../libraries/i686-linux/lib_release_client/libexpat.so.1,lib/libexpat.so.1
-#../../libraries/i686-linux/lib_release_client/libstdc++.so.6,lib/libstdc++.so.6
-../../libraries/i686-linux/lib_release_client/libelfio.so,lib/libelfio.so
-../../libraries/i686-linux/lib_release_client/libuuid.so,lib/libuuid.so.1
-../../libraries/i686-linux/lib_release_client/libSDL-1.2.so.0,lib/libSDL-1.2.so.0
+##../../libraries/i686-linux/lib_release_client/libkdu_v42R.so,lib/libkdu_v42R.so
+#../../libraries/i686-linux/lib_release_client/libfmod-3.75.so,lib/libfmod-3.75.so
+#../../libraries/i686-linux/lib_release_client/libapr-1.so.0,lib/libapr-1.so.0
+#../../libraries/i686-linux/lib_release_client/libaprutil-1.so.0,lib/libaprutil-1.so.0
+#../../libraries/i686-linux/lib_release_client/libdb-4.2.so,lib/libdb-4.2.so
+#../../libraries/i686-linux/lib_release_client/libogg.so.0,lib/libogg.so.0
+#../../libraries/i686-linux/lib_release_client/libvorbis.so.0,lib/libvorbis.so.0
+#../../libraries/i686-linux/lib_release_client/libvorbisfile.so.0,lib/libvorbisfile.so.0
+#../../libraries/i686-linux/lib_release_client/libvorbisenc.so.0,lib/libvorbisenc.so.0
+#../../libraries/i686-linux/lib_release_client/libcurl.so.4,lib/libcurl.so.4
+#../../libraries/i686-linux/lib_release_client/libcrypto.so.0.9.7,lib/libcrypto.so.0.9.7
+#../../libraries/i686-linux/lib_release_client/libssl.so.0.9.7,lib/libssl.so.0.9.7
+#../../libraries/i686-linux/lib_release_client/libexpat.so.1,lib/libexpat.so.1
+##../../libraries/i686-linux/lib_release_client/libstdc++.so.6,lib/libstdc++.so.6
+#../../libraries/i686-linux/lib_release_client/libelfio.so,lib/libelfio.so
+#../../libraries/i686-linux/lib_release_client/libuuid.so,lib/libuuid.so.1
+#../../libraries/i686-linux/lib_release_client/libSDL-1.2.so.0,lib/libSDL-1.2.so.0
More information about the SLDev
mailing list