Second Life viewer sources 1.19.0.0

1 files changed, 15 insertions, 11 deletions

diff --git a/linden/indra/newview/llfloaterworldmap.h b/linden/indra/newview/llfloaterworldmap.h
index 1d3dcd3..7addaa7 100644
--- a/linden/indra/newview/llfloaterworldmap.h
+++ b/linden/indra/newview/llfloaterworldmap.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -90,16 +90,16 @@ public:
         void                    trackLocation(const LLVector3d& pos);
         void                    trackEvent(const LLItemInfo &event_info);
         void                    trackGenericItem(const LLItemInfo &item);
-        void                    trackURL(const LLString& region_name, S32 x_coord, S32 y_coord, S32 z_coord);
+        void                    trackURL(const LLString& region_name, S32 x_coord, S32 y_coord, S32 z_coord);
 
         static const LLUUID& getHomeID() { return sHomeID; }
 
         // A z_attenuation of 0.0f collapses the distance into the X-Y plane
-        F32                     getDistanceToDestination(const LLVector3d& pos_global, F32 z_attenuation = 0.5f) const;
+        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                    clearLandmarkSelection(BOOL clear_ui = FALSE);
+        void                    clearLocationSelection(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
         // see the whole world, plus a little.
@@ -118,12 +118,15 @@ 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             onCommitBackground(void* data, bool from_click);
 
+        static void             onComboTextEntry( LLLineEditor* ctrl, void* data );
+        static void             onSearchTextEntry( LLLineEditor* ctrl, void* data );
+
         static void             onClearBtn(void*);
         static void             onFlyBtn(void*);
         static void             onClickTeleportBtn(void*);
@@ -143,18 +146,19 @@ protected:
         static void             onGoToLandmarkDialog(S32 option,void* userdata);
         void                    flyToLandmark();
         void                    teleportToLandmark();
-        void                    setLandmarkVisited();
+        void                    setLandmarkVisited();
 
         void                    buildAvatarIDList();
         void                    flyToAvatar();
         void                    teleportToAvatar();
 
         static void             updateSearchEnabled( LLUICtrl* ctrl, void* userdata );
+        static void             onLocationFocusChanged( LLFocusableElement* ctrl, void* userdata );
         static void             onLocationCommit( void* userdata );
         static void             onCommitLocation( LLUICtrl* ctrl, void* userdata );
         static void             onCommitSearchResult( LLUICtrl* ctrl, void* userdata );
 
-        void                    cacheLandmarkPosition();
+        void                    cacheLandmarkPosition();
 
 protected:
         LLTabContainerCommon*   mTabs;
@@ -165,7 +169,7 @@ protected:
 
         LLDynamicArray<LLUUID>  mLandmarkAssetIDList;
         LLDynamicArray<LLUUID>  mLandmarkItemIDList;
-        BOOL                                    mHasLandmarkPosition;
+        BOOL                                    mHasLandmarkPosition;
 
         static const LLUUID     sHomeID;