aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llmath
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/llmath
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/llmath')
-rw-r--r--linden/indra/llmath/lloctree.h6
-rw-r--r--linden/indra/llmath/lltreenode.h2
2 files changed, 2 insertions, 6 deletions
diff --git a/linden/indra/llmath/lloctree.h b/linden/indra/llmath/lloctree.h
index bced84c..2029554 100644
--- a/linden/indra/llmath/lloctree.h
+++ b/linden/indra/llmath/lloctree.h
@@ -68,8 +68,7 @@ template <class T>
68class LLOctreeTraveler : public LLTreeTraveler<T> 68class LLOctreeTraveler : public LLTreeTraveler<T>
69{ 69{
70public: 70public:
71 virtual void traverse(const LLTreeNode<T>* node); 71 virtual void traverse(const LLOctreeNode<T>* node);
72 virtual void visit(const LLTreeNode<T>* state) { }
73 virtual void visit(const LLOctreeNode<T>* branch) = 0; 72 virtual void visit(const LLOctreeNode<T>* branch) = 0;
74}; 73};
75 74
@@ -705,9 +704,8 @@ public:
705// LLOctreeTraveler 704// LLOctreeTraveler
706//======================== 705//========================
707template <class T> 706template <class T>
708void LLOctreeTraveler<T>::traverse(const LLTreeNode<T>* tree_node) 707void LLOctreeTraveler<T>::traverse(const LLOctreeNode<T>* node)
709{ 708{
710 const LLOctreeNode<T>* node = (const LLOctreeNode<T>*) tree_node;
711 node->accept(this); 709 node->accept(this);
712 for (U32 i = 0; i < node->getChildCount(); i++) 710 for (U32 i = 0; i < node->getChildCount(); i++)
713 { 711 {
diff --git a/linden/indra/llmath/lltreenode.h b/linden/indra/llmath/lltreenode.h
index ee98362..ccbeda5 100644
--- a/linden/indra/llmath/lltreenode.h
+++ b/linden/indra/llmath/lltreenode.h
@@ -82,8 +82,6 @@ class LLTreeTraveler
82{ 82{
83public: 83public:
84 virtual ~LLTreeTraveler() { }; 84 virtual ~LLTreeTraveler() { };
85 virtual void traverse(const LLTreeNode<T>* node) = 0;
86 virtual void visit(const LLTreeNode<T>* node) = 0;
87}; 85};
88 86
89template <class T> 87template <class T>