Tweaks mostly. Still fighting the Windlight popout, it sounds like this was a common issue with Emerald but I haven't found any fixes in their code as of yet.

"About" floater has been fixed to show the proper version numbering.
Graphics slider mucked with to increase draw distance maximum.

Signed-off-by: Beeks <HgDelirium@gmail.com>

indra/newview/llfloaterabout.cpp

@@ -119,12 +119,11 @@ LLFloaterAbout::LLFloaterAbout()
 	viewer_link_style->setColor(gSavedSettings.getColor4("HTMLLinkColor"));
 
 	// Version string
-	std::string version = LLAppViewer::instance()->getSecondLifeTitle()
+	std::string version = std::string(LLAppViewer::instance()->getSecondLifeTitle()
 		+ llformat(" %d.%d.%d (%d) %s %s (%s)\n",
-				   gSavedSettings.getU32("SpecifiedVersionMaj"), gSavedSettings.getU32("SpecifiedVersionMin"), gSavedSettings.getU32("SpecifiedVersionPatch"), gSavedSettings.getU32("SpecifiedVersionBuild"),
-				   __DATE__, __TIME__,
-				   gSavedSettings.getString("SpecifiedChannel").c_str());
-
+		LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VIEWER_BUILD,
+		__DATE__, __TIME__,
+		LL_CHANNEL));
 	support_widget->appendColoredText(version, FALSE, FALSE, gColors.getColor("TextFgReadOnlyColor"));
 	support_widget->appendStyledText(LLTrans::getString("ReleaseNotes"), false, false, viewer_link_style);
 

indra/newview/lloverlaybar.cpp

@@ -66,7 +66,12 @@
 #include "llvoiceremotectrl.h"
 #include "llmediactrl.h"
 #include "llselectmgr.h"
-#include "wlfPanel_AdvSettings.h" //Lower right Windlight and Rendering options
+#include "wlfPanel_AdvSettings.h"
+
+
+
+
+#include "llcontrol.h"
 
 //
 // Globals
@@ -117,7 +122,6 @@ LLOverlayBar::LLOverlayBar()
 	:	LLPanel(),
 		mMediaRemote(NULL),
 		mVoiceRemote(NULL),
-		mAdvSettings(NULL),
 		mMusicState(STOPPED),
 		mOriginalIMLabel("")
 {
@@ -149,18 +153,17 @@ bool updateChatVisible(const LLSD &data)
 	return true;
 }
 
-
 BOOL LLOverlayBar::postBuild()
 {
 	childSetAction("IM Received",onClickIMReceived,this);
 	childSetAction("Set Not Busy",onClickSetNotBusy,this);
 	childSetAction("Mouselook",onClickMouselook,this);
 	childSetAction("Stand Up",onClickStandUp,this);
-	//childSetAction("Cancel TP",onClickCancelTP,this);
+	childSetAction("Cancel TP",onClickCancelTP,this);
  	childSetAction("Flycam",onClickFlycam,this);
 	childSetVisible("chat_bar", gSavedSettings.getBOOL("ChatVisible"));
 
-	//mCancelBtn = getChild<LLButton>("Cancel TP");
+	mCancelBtn = getChild<LLButton>("Cancel TP");
 	setFocusRoot(TRUE);
 	mBuilt = true;
 
@@ -179,7 +182,6 @@ BOOL LLOverlayBar::postBuild()
 	return TRUE;
 }
 
-
 LLOverlayBar::~LLOverlayBar()
 {
 	// LLView destructor cleans up children
@@ -312,10 +314,32 @@ void LLOverlayBar::refresh()
 		buttons_changed = TRUE;
 	}
 
+	BOOL teleporting = FALSE;
+	if ((gAgent.getTeleportState() == LLAgent::TELEPORT_START) ||
+		(gAgent.getTeleportState() == LLAgent::TELEPORT_REQUESTED) ||
+		(gAgent.getTeleportState() == LLAgent::TELEPORT_MOVING) ||
+		(gAgent.getTeleportState() == LLAgent::TELEPORT_START))
+	{
+		teleporting = TRUE;
+	}
+	else
+	{
+		teleporting = FALSE;
+	}
+
+
+	button = getChild<LLButton>("Cancel TP");
+
+	if (button && button->getVisible() != teleporting)
+	{
+		button->setVisible(teleporting);
+		sendChildToFront(button);
+		moveChildToBackOfTabGroup(button);
+		buttons_changed = TRUE;
+	}
 
 	moveChildToBackOfTabGroup(mMediaRemote);
 	moveChildToBackOfTabGroup(mVoiceRemote);
-	moveChildToBackOfTabGroup(mAdvSettings);
 
 	// turn off the whole bar in mouselook
 	static BOOL last_mouselook = FALSE;
@@ -337,7 +361,7 @@ void LLOverlayBar::refresh()
 		{
 			// update "remotes"
 			childSetVisible("media_remote_container", TRUE);
-			//childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
+			childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
 			childSetVisible("AdvSettings_container", !sAdvSettingsPopup);//!gSavedSettings.getBOOL("wlfAdvSettingsPopup")); 
 			childSetVisible("AdvSettings_container_exp", sAdvSettingsPopup);//gSavedSettings.getBOOL("wlfAdvSettingsPopup")); 
 			childSetVisible("state_buttons", TRUE);
@@ -398,6 +422,24 @@ void LLOverlayBar::onClickStandUp(void*)
 	gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
 }
 
+//static
+void LLOverlayBar::onClickCancelTP(void* data)
+{
+	LLOverlayBar* self = (LLOverlayBar*)data;
+	self->setCancelTPButtonVisible(FALSE,std::string("Cancel"));
+	gAgent.teleportCancel();
+	llinfos << "trying to cancel teleport" << llendl;
+}
+
+void LLOverlayBar::setCancelTPButtonVisible(BOOL b, const std::string& label)
+{
+	mCancelBtn->setVisible( b );
+//	mCancelBtn->setEnabled( b );
+	mCancelBtn->setLabelSelected(label);
+	mCancelBtn->setLabelUnselected(label);
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // static media helpers
 // *TODO: Move this into an audio manager abstraction

indra/newview/lloverlaybar.h

@@ -88,9 +88,8 @@ public:
 
 	void setCancelTPButtonVisible(BOOL b, const std::string& label);
 
-	static BOOL sAdvSettingsPopup;
 	static BOOL sChatVisible;
-
+	static BOOL sAdvSettingsPopup;
 protected:	
 	static void* createMediaRemote(void* userdata);
 	static void* createVoiceRemote(void* userdata);
@@ -113,7 +112,7 @@ protected:
 private:
 	
 
-	/*static bool	updateAdvSettingsPopup(const LLSD &data);
+	/*static void	updateAdvSettingsPopup(const LLSD &data);
 	static void	updateChatVisible(const LLSD &data);*/
 
 };

indra/newview/skins/default/xui/en-us/floater_about.xml

@@ -7,6 +7,7 @@
 	     follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
   max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
   word_wrap="true">
+  Ascent is developed and maintained by Hg Beeks and Charley Levenque, with code contributions from: Hazim Gazov, Zwagoth Klaar, and viewers like you. Ascent is based off the Inertia source base.
   
   Ascent includes source code contributions of the following residents: Able Whitman, Adam Marker, Agathos Frascati, Aimee Trescothick, Alejandro Rosenthal, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ann Congrejo, Argent Stonecutter, Asuka Neely, Balp Allen, Benja Kepler, Biancaluce Robbiani, Blakar Ogre, blino Nakamura, Boroondas Gupte, Bulli Schumann, bushing Spatula, Carjay McGinnis, Catherine Pfeffer, Celierra Darling, Cron Stardust, Dale Glass, Drewan Keats, Dylan Haskell, Dzonatas Sol, Eddy Stryker, EponymousDylan Ra, Eva Nowicka, Farallon Greyskin, Feep Larsson, Flemming Congrejo, Fluf Fredriksson, Fremont Cunningham, Geneko Nemeth, Gigs Taggart, Ginko Bayliss, Grazer Kline, Gudmund Shepherd, Hamncheese Omlet, HappySmurf Papp, Henri Beauchamp, Hikkoshi Sakai, Hiro Sommambulist, Hoze Menges, Ian Kas, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Joghert LeSabre, Kage Pixel, Ken March, Kerutsen Sellery, Khyota Wulluf, Kunnis Basiat, Lisa Lowe, Lockhart Cordoso, maciek marksman, Magnus Balczo, Malwina Dollinger, march Korda, Matthew Dowd, McCabe Maxsted, Michelle2 Zenovka, Mm Alder, Mr Greggan, Nicholaz Beresford, Nounouch Hapmouche, Patric Mills, Paul Churchill, Paula Innis, Peekay Semyorka, Peter Lameth, Pf Shan, princess niven, Renault Clio, Ringo Tuxing, Robin Cornelius, Ryozu Kojima, Salahzar Stenvaag, Sammy Frederix, Scrippy Scofield, Seg Baphomet, Sergen Davies, SignpostMarv Martin, Simon Nolan, SpacedOut Frye, Sporked Friis, Stevex Janus, Still Defiant, Strife Onizuka, Tayra Dagostino, TBBle Kurosawa, Teardrops Fall, tenebrous pau, Tharax Ferraris, Thickbrick Sleaford, Thraxis Epsilon, tiamat bingyi, TraductoresAnonimos Alter, Tue Torok, Vadim Bigbear, Vixen Heron, Whoops Babii, Wilton Lundquist, Zarkonnen Decosta, Zi Ree, Zipherius Turas
   

indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml

@@ -247,7 +247,7 @@
 	<slider bottom="-135" can_edit_text="false" control_name="RenderFarClip"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"
 	     increment="8" initial_val="160" label="Draw Distance:"
-	     label_width="140" left="215" max_val="512" min_val="64" mouse_opaque="true"
+	     label_width="140" left="215" max_val="1024" min_val="64" mouse_opaque="true"
 	     name="DrawDistance" show_text="true" width="255" />
 	<slider bottom_delta="-20" can_edit_text="false" control_name="RenderMaxPartCount"
 	     decimal_digits="0" enabled="true" follows="left|top" height="16"