Attachment #151753 for bug #127026

View | Details | Raw Unified | Return to bug 127026 | Differences between

and this patch

Lines 112-118 Link Here

(-)linden.orig/indra/SConstruct (-4 / +8 lines)
112	channel = optenv['CHANNEL']	112	channel = optenv['CHANNEL']
113	standalone = optenv['STANDALONE']	113	standalone = optenv['STANDALONE']
114	opensource = standalone or optenv['OPENSOURCE']	114	opensource = standalone or optenv['OPENSOURCE']
115	enable_fmod = not opensource and optenv['FMOD']	115	enable_fmod = optenv['FMOD']
116	elfio = optenv['ELFIO']	116	elfio = optenv['ELFIO']
117		117
118	targets = [ target_param ]	118	targets = [ target_param ]
Lines 135-140 Link Here
135	'gdk-pixbuf-2.0',	135	'gdk-pixbuf-2.0',
136	'glib-2.0',	136	'glib-2.0',
137	'gmodule-2.0',	137	'gmodule-2.0',
		138	'gthread-2.0',
138	'gtk+-2.0',	139	'gtk+-2.0',
139	'libpng',	140	'libpng',
140	'pango',	141	'pango',
Lines 155-160 Link Here
155	'libssl',	156	'libssl',
156	]	157	]
157		158
		159	if enable_gstreamer:
		160	standalone_pkgs += [ 'gstreamer-0.10' ]
		161
158	def pkgconfig(opt, pkgs=None):	162	def pkgconfig(opt, pkgs=None):
159	if pkgs is None:	163	if pkgs is None:
160	pkgs = standalone_pkgs + standalone_net_pkgs	164	pkgs = standalone_pkgs + standalone_net_pkgs
Lines 243-249 Link Here
243	##############	247	##############
244		248
245	# Generic GCC flags	249	# Generic GCC flags
246	cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -Werror -fexceptions '	250	cflags = '-g -pipe -Wall -Wno-reorder -Wno-trigraphs -Wno-sign-compare -fexceptions '
247	cxxflags = ''	251	cxxflags = ''
248	cppflags = '-D_FORTIFY_SOURCE=2 '	252	cppflags = '-D_FORTIFY_SOURCE=2 '
249	if standalone:	253	if standalone:
Lines 602-608 Link Here
602	net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]	606	net_external_libs = [ 'curl', 'ssl', 'crypto', 'aprutil-1', 'apr-1' ]
603	net_external_libs += [ 'cares', 'expat' ]	607	net_external_libs += [ 'cares', 'expat' ]
604		608
605	common_external_libs = net_external_libs + [ 'xmlrpc-epi', 'z' ]	609	common_external_libs = net_external_libs + [ 'xmlrpc', 'z' ]
606		610
607	if build_target == 'client':	611	if build_target == 'client':
608	if platform == 'linux':	612	if platform == 'linux':
Lines 742-748 Link Here
742	internal_libs + external_libs)	746	internal_libs + external_libs)
743		747
744	# Rpcserver	748	# Rpcserver
745	external_libs = common_external_libs + ['xmlrpc-epi', 'mysqlclient']	749	external_libs = common_external_libs + ['xmlrpc', 'mysqlclient']
746	internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs',	750	internal_libs = ['llscene', 'llmessage', 'lldatabase', 'llvfs',
747	'llmath', 'llcommon']	751	'llmath', 'llcommon']
748	create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',	752	create_executable('rpcserver/rpcserver' + file_suffix, 'rpcserver',

Lines 33-39 Link Here

(-)linden.orig/indra/llimagej2coj/llimagej2coj.cpp (-1 / +1 lines)
33	#include "llimagej2coj.h"	33	#include "llimagej2coj.h"
34		34
35	// this is defined so that we get static linking.	35	// this is defined so that we get static linking.
36	#include "openjpeg/openjpeg.h"	36	#include "openjpeg.h"
37		37
38	#include "lltimer.h"	38	#include "lltimer.h"
39	#include "llmemory.h"	39	#include "llmemory.h"




	{
	default:
	case LLQuaternion::XYZ:
		strcpy(p, "XYZ");
		break;
	case LLQuaternion::YZX:
		strcpy(p, "YZX");
		break;
	case LLQuaternion::ZXY:
		strcpy(p, "ZXY");
		break;
	case LLQuaternion::XZY:
		strcpy(p, "XZY");
		break;
	case LLQuaternion::YXZ:
		strcpy(p, "YXZ");
		break;
	case LLQuaternion::ZYX:
		strcpy(p, "ZYX");
		break;
	}
	return p;

Lines 80-86 Link Here

(-)linden.orig/indra/llmessage/llfiltersd2xmlrpc.cpp (-1 / +1 lines)
80		80
81	#include <sstream>	81	#include <sstream>
82	#include <iterator>	82	#include <iterator>
83	#include <xmlrpc-epi/xmlrpc.h>	83	#include <xmlrpc.h>
84	#include "apr-1/apr_base64.h"	84	#include "apr-1/apr_base64.h"
85		85
86	#include "llbuffer.h"	86	#include "llbuffer.h"

Lines 64-70 Link Here

(-)linden.orig/indra/llwindow/llgl.cpp (-1 / +1 lines)
64	# include "GL/glxext.h"	64	# include "GL/glxext.h"
65	// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol	65	// Use glXGetProcAddressARB instead of glXGetProcAddress - the ARB symbol
66	// is considered 'legacy' but works on more machines.	66	// is considered 'legacy' but works on more machines.
67	# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddressARB((const GLubyte*)(p))	67	# define GLH_EXT_GET_PROC_ADDRESS(p) glXGetProcAddress((const GLubyte*)(p))
68	#endif // LL_LINUX && !LL_MESA_HEADLESS	68	#endif // LL_LINUX && !LL_MESA_HEADLESS
69		69
70		70

Lines 45-51 Link Here

(-)linden.orig/indra/newview/lluserauth.cpp (-1 / +1 lines)
45		45
46	// NOTE: MUST include these after otherincludes since queue gets redefined!?!!	46	// NOTE: MUST include these after otherincludes since queue gets redefined!?!!
47	#include <curl/curl.h>	47	#include <curl/curl.h>
48	#include <xmlrpc-epi/xmlrpc.h>	48	#include <xmlrpc.h>
49		49
50		50
51		51

Lines 39-45 Link Here

(-)linden.orig/indra/newview/llvoiceclient.cpp (-1 / +1 lines)
39	#include "llvoavatar.h"	39	#include "llvoavatar.h"
40	#include "llbufferstream.h"	40	#include "llbufferstream.h"
41	#include "llfile.h"	41	#include "llfile.h"
42	#include "expat/expat.h"	42	#include "expat.h"
43	#include "llcallbacklist.h"	43	#include "llcallbacklist.h"
44	#include "llviewerregion.h"	44	#include "llviewerregion.h"
45	#include "llviewernetwork.h" // for gUserServerChoice	45	#include "llviewernetwork.h" // for gUserServerChoice

Lines 37-43 Link Here

(-)linden.orig/indra/newview/llxmlrpctransaction.cpp (-1 / +1 lines)
37		37
38	// Have to include these last to avoid queue redefinition!	38	// Have to include these last to avoid queue redefinition!
39	#include <curl/curl.h>	39	#include <curl/curl.h>
40	#include <xmlrpc-epi/xmlrpc.h>	40	#include <xmlrpc.h>
41		41
42	#include "viewer.h"	42	#include "viewer.h"
43		43

Return to bug 127026

Lines 698-719 Link Here

(-)linden.orig/indra/llmath/llquaternion.cpp (-6 / +6 lines)
698	{	698	{
699	default:	699	default:
700	case LLQuaternion::XYZ:	700	case LLQuaternion::XYZ:
701	p = "XYZ";	701	strcpy(p, "XYZ");
702	break;	702	break;
703	case LLQuaternion::YZX:	703	case LLQuaternion::YZX:
704	p = "YZX";	704	strcpy(p, "YZX");
705	break;	705	break;
706	case LLQuaternion::ZXY:	706	case LLQuaternion::ZXY:
707	p = "ZXY";	707	strcpy(p, "ZXY");
708	break;	708	break;
709	case LLQuaternion::XZY:	709	case LLQuaternion::XZY:
710	p = "XZY";	710	strcpy(p, "XZY");
711	break;	711	break;
712	case LLQuaternion::YXZ:	712	case LLQuaternion::YXZ:
713	p = "YXZ";	713	strcpy(p, "YXZ");
714	break;	714	break;
715	case LLQuaternion::ZYX:	715	case LLQuaternion::ZYX:
716	p = "ZYX";	716	strcpy(p, "ZYX");
717	break;	717	break;
718	}	718	}
719	return p;	719	return p;