diff options
| author | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-07 00:53:05 +0000 |
| commit | 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 (patch) | |
| tree | d8f5c98644029dd289a97aa0d8b55c5a6200c214 /indra/newview/llagent.h | |
| parent | 2c722655bd6701a3dc8518c6518c51f538765dcd (diff) | |
Merge skinning-14 to viewer-2, including refactoring many floaters to register them with LLFloaterReg, support for introspection of ParamBlock based UI widgets to dump XML schema, splitting llfolderview.cpp into three separate files to unravel dependencies and skeleton for for LLListView widget. Resolved conflicts in these files:
lldraghandle.h, lluictrl.h, llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp, llviewermenu.cpp, floater_mute.xml, floater_preferences.xml, notifications.xml, panel_preferences_audio.xml, panel_preferences_graphics1.xml, panel_region_general.xml
svn merge -r124961:126284 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14
Diffstat (limited to 'indra/newview/llagent.h')
| -rw-r--r-- | indra/newview/llagent.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 743784b2ef..22b3790c6b 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -182,10 +182,7 @@ private: public: LLVOAvatarSelf* getAvatarObject() const { return mAvatarObject; } - const LLUUID& getInventoryRootID() const { return mInventoryRootID; } - LLUUID& getInventoryRootID() { return mInventoryRootID; } private: - LLUUID mInventoryRootID; LLPointer<LLVOAvatarSelf> mAvatarObject; // NULL until avatar object sent down from simulator /** General Accessors |