From 6c1196d052e876bddd75bf9eeb71f75d64e60cc5 Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 12 Jun 2012 09:02:47 -0700
Subject: Enable /LARGEADDRESSAWARE compiler flag for windows compiling This
 allows the app to allocate up to 4GB memory on 64bit hosts and 32bit hosts
 with PAE instead of 2GB 32bit stock OSs will still be limited to 2GB, with no
 bemnifit or negigitive impact This has the benifit of not crashing the viewer
 when the viewer memory exceeds 2GB on 64bit hosts Linux and Mac by nature use
 up to 4GB for a 32bit app, even on a 32bit host

---
 indra/cmake/00-Common.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 98eeed09b3..303f7e5608 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -51,6 +51,7 @@ if (WINDOWS)
   set(CMAKE_CXX_FLAGS_RELEASE
       "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /Ob2 -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release options" FORCE)
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /LARGEADDRESSAWARE")
 
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
   set(CMAKE_C_STANDARD_LIBRARIES "")
-- 
cgit v1.3


From 361a413d25509e0055b5f0dbaae7a5a50264a84f Mon Sep 17 00:00:00 2001
From: Tank_Master <none@none>
Date: Tue, 12 Jun 2012 09:06:12 -0700
Subject: Add myself to contributions.txt

---
 doc/contributions.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 04edfb4bea..dffb41fb78 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1091,6 +1091,7 @@ Sudane Erato
 Synystyr Texan
 Takeda Terrawyng
 TankMaster Finesmith
+	OPEN-142
 	STORM-1100
 	STORM-1602
 	STORM-1258
-- 
cgit v1.3