diff options
| author | Aleric Inglewood | 2010-11-07 16:55:50 +0100 |
|---|---|---|
| committer | Aleric Inglewood | 2010-11-07 18:27:48 +0100 |
| commit | 5b4356cefbaa7dbdc8656e7283c110a893b1a89c (patch) | |
| tree | 43fae9945562c3281746370d623877840ed884b2 /linden/indra/llrender/llgl.cpp | |
| parent | IMP-688: ERROR: getString: Invalid string control nick01 (diff) | |
| download | meta-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 '')
| -rw-r--r-- | linden/indra/llrender/llgl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
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 | ||
| 550 | extern LLCPUInfo gSysCPU; | ||
| 551 | |||
| 552 | void LLGLManager::initExtensions() | 550 | void LLGLManager::initExtensions() |
| 553 | { | 551 | { |
| 554 | #if LL_MESA_HEADLESS | 552 | #if LL_MESA_HEADLESS |