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/lltoolpie.h | |
| 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/lltoolpie.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/lltoolpie.h b/linden/indra/newview/lltoolpie.h index 54bf409..001886f 100644 --- a/linden/indra/newview/lltoolpie.h +++ b/linden/indra/newview/lltoolpie.h | |||
| @@ -86,6 +86,7 @@ private: | |||
| 86 | LLPickInfo mPick; | 86 | LLPickInfo mPick; |
| 87 | U8 mClickAction; | 87 | U8 mClickAction; |
| 88 | LLSafeHandle<LLObjectSelection> mLeftClickSelection; | 88 | LLSafeHandle<LLObjectSelection> mLeftClickSelection; |
| 89 | protected: | ||
| 89 | LLPointer<LLViewerObject> mClickActionObject; | 90 | LLPointer<LLViewerObject> mClickActionObject; |
| 90 | }; | 91 | }; |
| 91 | 92 | ||