diff options
Diffstat (limited to 'linden/indra/newview/llpanelavatar.h')
-rw-r--r-- | linden/indra/newview/llpanelavatar.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/linden/indra/newview/llpanelavatar.h b/linden/indra/newview/llpanelavatar.h index b3b4e72..05b18c5 100644 --- a/linden/indra/newview/llpanelavatar.h +++ b/linden/indra/newview/llpanelavatar.h | |||
@@ -323,16 +323,15 @@ public: | |||
323 | static void onClickCSR( void *userdata); | 323 | static void onClickCSR( void *userdata); |
324 | static void onClickMute( void *userdata); | 324 | static void onClickMute( void *userdata); |
325 | 325 | ||
326 | private: | ||
327 | void enableOKIfReady(); | ||
328 | |||
326 | static void finishKick(S32 option, const LLString& text, void* userdata); | 329 | static void finishKick(S32 option, const LLString& text, void* userdata); |
327 | static void finishFreeze(S32 option, const LLString& text, void* userdata); | 330 | static void finishFreeze(S32 option, const LLString& text, void* userdata); |
328 | static void finishUnfreeze(S32 option, const LLString& text, void* userdata); | 331 | static void finishUnfreeze(S32 option, const LLString& text, void* userdata); |
329 | 332 | ||
330 | static void showProfileCallback(S32 option, void *userdata); | 333 | static void showProfileCallback(S32 option, void *userdata); |
331 | 334 | ||
332 | // Teen users are not allowed to see or enter data into the first life page, | ||
333 | // or their own about/interests text entry fields. | ||
334 | static BOOL sAllowFirstLife; | ||
335 | |||
336 | static void* createPanelAvatar(void* data); | 335 | static void* createPanelAvatar(void* data); |
337 | static void* createFloaterAvatarInfo(void* data); | 336 | static void* createFloaterAvatarInfo(void* data); |
338 | static void* createPanelAvatarSecondLife(void* data); | 337 | static void* createPanelAvatarSecondLife(void* data); |
@@ -353,13 +352,20 @@ public: | |||
353 | LLPanelAvatarWeb* mPanelWeb; | 352 | LLPanelAvatarWeb* mPanelWeb; |
354 | 353 | ||
355 | LLDropTarget* mDropTarget; | 354 | LLDropTarget* mDropTarget; |
355 | |||
356 | // Teen users are not allowed to see or enter data into the first life page, | ||
357 | // or their own about/interests text entry fields. | ||
358 | static BOOL sAllowFirstLife; | ||
356 | 359 | ||
357 | protected: | 360 | private: |
358 | void enableOKIfReady(); | ||
359 | LLUUID mAvatarID; // for which avatar is this window? | 361 | LLUUID mAvatarID; // for which avatar is this window? |
360 | BOOL mIsFriend; // Are we friends? | 362 | BOOL mIsFriend; // Are we friends? |
361 | BOOL mHaveProperties; | 363 | BOOL mHaveProperties; |
362 | BOOL mHaveStatistics; | 364 | BOOL mHaveStatistics; |
365 | // only update note if data received from database and | ||
366 | // note is changed from database version | ||
367 | bool mHaveNotes; | ||
368 | std::string mLastNotes; | ||
363 | LLTabContainerCommon* mTab; | 369 | LLTabContainerCommon* mTab; |
364 | BOOL mAllowEdit; | 370 | BOOL mAllowEdit; |
365 | 371 | ||