diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-04-17 02:56:14 +0000 |
| commit | a3f3ab7e113e44309461b26399d627814f0ce4f9 (patch) | |
| tree | 695b2a41f8d31330634ef59e7d6ece526242fd86 /indra/newview/llfloaterworldmap.h | |
| parent | d85247e63e5ff0b488211b62429a4895b48dee27 (diff) | |
QAR-449 Viewer 1.20 RC 1
merge Branch_1-20-Viewer -r 84432 : 84760 -> release
Diffstat (limited to 'indra/newview/llfloaterworldmap.h')
| -rw-r--r-- | indra/newview/llfloaterworldmap.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llfloaterworldmap.h b/indra/newview/llfloaterworldmap.h index 78bc95c48f..3cf12a9eb7 100644 --- a/indra/newview/llfloaterworldmap.h +++ b/indra/newview/llfloaterworldmap.h @@ -80,9 +80,9 @@ public: void observeInventory(LLInventoryModel* inventory); void inventoryChanged(); - //// Calls for dealing with changes in friendship - //void observeFriends(); - //void friendsChanged(); + // Calls for dealing with changes in friendship + void observeFriends(); + void friendsChanged(); // tracking methods void trackAvatar( const LLUUID& avatar_id, const LLString& name ); @@ -98,7 +98,7 @@ public: F32 getDistanceToDestination(const LLVector3d& pos_global, F32 z_attenuation = 0.5f) const; void clearLocationSelection(BOOL clear_ui = FALSE); - //void clearAvatarSelection(BOOL clear_ui = FALSE); + void clearAvatarSelection(BOOL clear_ui = FALSE); void clearLandmarkSelection(BOOL clear_ui = FALSE); // Adjust the maximally zoomed out limit of the zoom slider so you can @@ -119,8 +119,8 @@ protected: static void onLandmarkComboPrearrange( LLUICtrl* ctrl, void* data ); static void onLandmarkComboCommit( LLUICtrl* ctrl, void* data ); - //static void onAvatarComboPrearrange( LLUICtrl* ctrl, void* data ); - //static void onAvatarComboCommit( LLUICtrl* ctrl, void* data ); + static void onAvatarComboPrearrange( LLUICtrl* ctrl, void* data ); + static void onAvatarComboCommit( LLUICtrl* ctrl, void* data ); static void onCommitBackground(void* data, bool from_click); @@ -148,7 +148,7 @@ protected: void teleportToLandmark(); void setLandmarkVisited(); - //void buildAvatarIDList(); + void buildAvatarIDList(); void flyToAvatar(); void teleportToAvatar(); |