diff options
| author | Robin Cornelius | 2010-10-10 22:10:33 +0100 |
|---|---|---|
| committer | Robin Cornelius | 2010-10-10 22:10:33 +0100 |
| commit | b3b30285126289f54b57bd42569bb0721e40e088 (patch) | |
| tree | f4aaccb98d1a835c4ea376ec2803fc410a704052 /linden/indra/newview/llmanip.cpp | |
| parent | Merge branch 'mccabe-plugins' into plugins_merge (diff) | |
| download | meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.zip meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.gz meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.bz2 meta-impy-b3b30285126289f54b57bd42569bb0721e40e088.tar.xz | |
Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system"
This reverts commit 087e15e89930d51c3964329befb273ae3b2d330d.
Conflicts:
linden/indra/newview/llsurface.cpp
linden/indra/newview/llviewerwindow.cpp
linden/indra/newview/llvoavatar.cpp
linden/indra/newview/pipeline.cpp
linden/indra/newview/pipeline.h
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/llmanip.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp index 0c88c47..45550fc 100644 --- a/linden/indra/newview/llmanip.cpp +++ b/linden/indra/newview/llmanip.cpp | |||
| @@ -60,7 +60,7 @@ | |||
| 60 | #include "llglheaders.h" | 60 | #include "llglheaders.h" |
| 61 | 61 | ||
| 62 | // Local constants... | 62 | // Local constants... |
| 63 | const S32 VERTICAL_OFFSET = 100; // KL adjusted to compensate for toolbars move to the top of the screen! | 63 | const S32 VERTICAL_OFFSET = 50; |
| 64 | 64 | ||
| 65 | F32 LLManip::sHelpTextVisibleTime = 2.f; | 65 | F32 LLManip::sHelpTextVisibleTime = 2.f; |
| 66 | F32 LLManip::sHelpTextFadeTime = 2.f; | 66 | F32 LLManip::sHelpTextFadeTime = 2.f; |