Changeset 2662 for code/trunk/src/core/Template.h
- Timestamp:
- Feb 14, 2009, 10:17:35 PM (16 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/core/Template.h
- Property svn:mergeinfo changed
/code/branches/network/src/core/Template.h (added) merged: 2356 /code/branches/objecthierarchy2/src/core/Template.h (added) merged: 2173 /code/branches/physics_merge/src/core/Template.h (added) merged: 2442 /code/branches/presentation/src/core/Template.h (added) merged: 2371,2420,2459,2485,2492-2493,2500
r2261 r2662 53 53 { return this->link_; } 54 54 55 inline void setLoadDefaults(bool bLoadDefaults) 56 { this->bLoadDefaults_ = bLoadDefaults; } 57 inline bool getLoadDefaults() const 58 { return this->bLoadDefaults_; } 59 55 60 inline void setXMLElement(const TiXmlElement& xmlelement) 56 61 { this->xmlelement_ = xmlelement; } … … 75 80 Identifier* baseclassIdentifier_; 76 81 bool bIsLink_; 82 bool bLoadDefaults_; 77 83 mutable bool bIsReturningXMLElement_; 78 84 }; - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.