diff options
author | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:44:54 -0500 |
commit | b2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch) | |
tree | 3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llvoavatar.h | |
parent | Second Life viewer sources 1.14.0.1 (diff) | |
download | meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2 meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz |
Second Life viewer sources 1.15.0.2
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llvoavatar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h index ff37848..2a2c0f0 100644 --- a/linden/indra/newview/llvoavatar.h +++ b/linden/indra/newview/llvoavatar.h | |||
@@ -5,6 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Copyright (c) 2001-2007, Linden Research, Inc. | 6 | * Copyright (c) 2001-2007, Linden Research, Inc. |
7 | * | 7 | * |
8 | * Second Life Viewer Source Code | ||
8 | * The source code in this file ("Source Code") is provided by Linden Lab | 9 | * The source code in this file ("Source Code") is provided by Linden Lab |
9 | * to you under the terms of the GNU General Public License, version 2.0 | 10 | * to you under the terms of the GNU General Public License, version 2.0 |
10 | * ("GPL"), unless you have obtained a separate licensing agreement | 11 | * ("GPL"), unless you have obtained a separate licensing agreement |
@@ -387,7 +388,7 @@ public: | |||
387 | virtual LLVector3 getVolumePos(S32 joint_index, LLVector3& volume_offset); | 388 | virtual LLVector3 getVolumePos(S32 joint_index, LLVector3& volume_offset); |
388 | virtual LLJoint* findCollisionVolume(U32 volume_id); | 389 | virtual LLJoint* findCollisionVolume(U32 volume_id); |
389 | virtual S32 getCollisionVolumeID(std::string &name); | 390 | virtual S32 getCollisionVolumeID(std::string &name); |
390 | virtual void addDebugText(const char* text); | 391 | virtual void addDebugText(const std::string& text); |
391 | virtual const LLUUID& getID(); | 392 | virtual const LLUUID& getID(); |
392 | virtual LLJoint *getJoint( const std::string &name ); | 393 | virtual LLJoint *getJoint( const std::string &name ); |
393 | 394 | ||