Linux compile fixes.

Sat, 02 Dec 2017 12:08:52 -0600

author
Tonya Souther <tonya.souther@gmail.com>
date
Sat, 02 Dec 2017 12:08:52 -0600
changeset 53536
70e2de44210c
parent 53535
565445f192f2
child 53537
55a5f66f6db8

Linux compile fixes.

indra/newview/fspanelradar.cpp file | annotate | diff | revisions
indra/newview/fsradar.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/fspanelradar.cpp	Sat Dec 02 14:26:48 2017 +0100
     1.2 +++ b/indra/newview/fspanelradar.cpp	Sat Dec 02 12:08:52 2017 -0600
     1.3 @@ -366,10 +366,6 @@
     1.4  		{
     1.5  			row_data["columns"][2]["value"] = "avatar_in_region";
     1.6  		}
     1.7 -		else
     1.8 -		{
     1.9 -			"";
    1.10 -		}
    1.11  
    1.12  		row_data["columns"][3]["column"] = "typing_status";
    1.13  		row_data["columns"][3]["type"] = "icon";
     2.1 --- a/indra/newview/fsradar.cpp	Sat Dec 02 14:26:48 2017 +0100
     2.2 +++ b/indra/newview/fsradar.cpp	Sat Dec 02 12:08:52 2017 -0600
     2.3 @@ -51,7 +51,7 @@
     2.4  #include "lltrans.h"
     2.5  #include "llviewercontrol.h"		// for gSavedSettings
     2.6  #include "llviewermenu.h"			// for gMenuHolder
     2.7 -#include "llViewerparcelmgr.h"
     2.8 +#include "llviewerparcelmgr.h"
     2.9  #include "llvoavatar.h"
    2.10  #include "llvoiceclient.h"
    2.11  #include "llworld.h"

mercurial