aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llrender
diff options
context:
space:
mode:
authorAleric Inglewood2010-11-07 16:55:50 +0100
committerAleric Inglewood2010-11-07 18:27:48 +0100
commit5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch)
tree43fae9945562c3281746370d623877840ed884b2 /linden/indra/llrender
parentIMP-688: ERROR: getString: Invalid string control nick01 (diff)
downloadmeta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.zip
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.gz
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.bz2
meta-impy-5b4356cefbaa7dbdc8656e7283c110a893b1a89c.tar.xz
IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins
See http://jira.secondlife.com/browse/SNOW-713 This patch makes llcommon shared. It contains the following snowglobe (SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500, 3519 and 3531, plus the fix for all rejects. Note that changes to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500 and 3625) were ignored as we don't have scripts/automated_build_scripts.
Diffstat (limited to 'linden/indra/llrender')
-rw-r--r--linden/indra/llrender/llfontgl.cpp1
-rw-r--r--linden/indra/llrender/llgl.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 5d3d6a7..7baec81 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -42,6 +42,7 @@
42#include "llrender.h" 42#include "llrender.h"
43#include "v4color.h" 43#include "v4color.h"
44#include "llstl.h" 44#include "llstl.h"
45#include "llfasttimer.h"
45 46
46const S32 BOLD_OFFSET = 1; 47const S32 BOLD_OFFSET = 1;
47 48
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 2e9b2bd..4a4ff1b 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -547,8 +547,6 @@ void LLGLManager::shutdownGL()
547// these are used to turn software blending on. They appear in the Debug/Avatar menu 547// these are used to turn software blending on. They appear in the Debug/Avatar menu
548// presence of vertex skinning/blending or vertex programs will set these to FALSE by default. 548// presence of vertex skinning/blending or vertex programs will set these to FALSE by default.
549 549
550extern LLCPUInfo gSysCPU;
551
552void LLGLManager::initExtensions() 550void LLGLManager::initExtensions()
553{ 551{
554#if LL_MESA_HEADLESS 552#if LL_MESA_HEADLESS