HTTP Proxy Configuration

.gitignore

@@ -10,3 +10,4 @@ compile.bat
 *.resources
 *~
 *.userprefs
+.vs

.travis.yml

@@ -0,0 +1,39 @@
+language: csharp
+solution: Radegast.sln
+
+os:
+  - linux
+
+branches:
+  except:
+    - /^build-/
+
+install:
+<<<<<<< HEAD
+  - "export BUILD_MAJOR=2"
+  - "export BUILD_MINOR=19"
+  - "export GIT_TAG=build-$BUILD_MAJOR.$BUILD_MINOR.$TRAVIS_BUILD_NUMBER-$TRAVIS_OS_NAME-$TRAVIS_BRANCH-$(date -u '+%Y-%m-%d')"
+  - "export GIT_ARTIFACT=Radegast-$GIT_TAG.zip"
+  - "./ci/install.sh"
+=======
+  - "./runprebuild.sh"
+>>>>>>> parent of 4828a00... Moving all build numbers to one location
+
+before_deploy:
+  - "export GIT_TAG=build-$TRAVIS_BUILD_NUMBER-$TRAVIS_OS_NAME-$TRAVIS_BRANCH-$(date -u '+%Y-%m-%d')"
+  - "export GIT_ARTIFACT=Radegast-$GIT_TAG.zip"
+  - "./before_deploy.sh"
+
+deploy:
+  provider: releases
+  api_key:
+    secure: wDIvmLG2B0wA4Ngp+avp1qQOU3lpUIC79C/iEo/BDNA4TQJLeAvYrQ7mXVjXrSP41LCB9aWmjjlTJk8nRbEcTWwiYTRDPRqvxo32/BPsW6zaBrqHGP1dF3R8L/KtVRf97iNJJRXWHZssNYsuakBKTHp6dPt68qU6k3cig7aiVH/qTwawYpI9/qtUUdfuN3h9/PciujyAr/XBpTzS7xLHsHShchMpgEVhGqtjd+yR2z0qojNs645Iit7lZOMrtjuqNLjxXS3WLbWVHT22upX+00ovlJXT6fUtkHKWuAW3hSEN525/I8bl7NExLpy9yOUa/D1JALBgrd2qxhsECJ+sJ9ms59iQxYJOOpfuk6KIjmtD+i4f6h2rSOjOtbc1dUvA9+SH27o00DPjFQKPA0lLqEPGBxdlFE0ocOHI2UW1wvTRSAUhJe6QLLatVLJl5TfcDOsM7JC29XeuHXL1wHFRqEq8agpdR8UqueaDkfAWVPXQRywVD/aUFrMMJEfxTncVhRXepLL3z2uHwjpRaw5JJ7hsU5eaEEvIRMzR73IOCHlfmqCtjE7bMVmO9Zn0BjGJURHCk77I395QLWnCOuMShWm1OnH5Klxjehlgqtpdhaj83OgsnE7/sXsMPaqxwtzusTRsRYmJz/4D5B7/TPVNDzK2Xewr0NKEBmY3n/MnAqc=
+  skip_cleanup: true
+  file: $GIT_ARTIFACT
+  on:
+    repo: nooperation/radegast
+    all_branches: true
+
+env:
+  global:
+    secure: u7t+c2187aIGA/Kn/DV1/4kjJ/BmQ6/x5AKAbqdFy7R8xdY2ohOpbITclZ7aox+6PdErmrQBUNZoTfQmehYTw/DOIhA6DE3N4wJ0tGVMnOWAwsX/KWddeQkycfF/SIhcOUrl+3Muv9CJiskYHul7mnfNZzv78ZHFfoaP3zt0Jy6JEOJmAiE36OLh9NBGRyRjVWLg4AVTXdNo0vFmOZgzOoJHPAtkB/18OjZp1RHe5l9io5ww4BY/ZcxodG52WaqTwKh2fCt1juF64a1rncQiUgkBWl7jocErS3DOQ9c5/60kAhimEVAKyaSJJlpBXbYwY7IIAatDwa6ep/0xZ5pIh6QW0ffSXuxBrf15NmlKZqmuUVJ32avVRJ53rvg2MZLrsJwBC+8bsrk6RyXoph/lCweiepHm5v0c68i89xviXXV8X9xN8fxyCGQOMKR6xP7/uMbpEbIWiSmuz5ayw19HFKkTeefqWq+Q4McaTOXf56lJ7gQIDN1QLOlmGJd7A57ftJYlfr5He7hS5ciXrEshDh+Yu4PdIUz2pB73LsHmT22XPWs575g0nxwcsE3dv86h/CuVWuOyZT6u5DIokj4k+rF2rXqqXCrJ3/Wp9T26S3UO/Q5gVVXTEymIsBqjPzbnbuRcYwK97r8vEXJ1dGKZMrhNX33GnqBVVIfrs7ZJHas=

README.md

@@ -14,7 +14,7 @@ Developers:
 # License
 
 **Radegast Metaverse Client**<br>
-*Copyright © 2009-2011, Radegast Development Team*<br>
+*Copyright © 2009-2016, Radegast Development Team*<br>
 *All rights reserved.*
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -73,3 +73,7 @@ http://commandline.codeplex.com/<br>
 Uses code snippets from CSAT Library (MIT License)<br>
 Copyright © 2011 mjt<br>
 http://code.google.com/p/csat/<br>
+
+Uses SmartIrc4net (LGPL)<br>
+Copyright © 2003-2005 Mirco Bauer<br>
+http://www.meebey.net/projects/smartirc4net/<br>

Radegast/Core/ChatBufferItem.cs

@@ -104,6 +104,8 @@ public enum ChatBufferTextStyle
         Error,
         Alert,
         OwnerSay,
-        Invisible
+        Invisible,
+        Emote,
+        Self
     }
 }

Radegast/Core/ChatTextManager.cs

@@ -35,11 +35,14 @@
 using Radegast.Netcom;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
+using System.Web.Script.Serialization;
+using System.ComponentModel;
 
 namespace Radegast
 {
     public class ChatTextManager : IDisposable
     {
+
         public event EventHandler<ChatLineAddedArgs> ChatLineAdded;
 
         private RadegastInstance instance;
@@ -51,6 +54,8 @@ public class ChatTextManager : IDisposable
 
         private bool showTimestamps;
 
+        public static Dictionary<string, Settings.FontSetting> fontSettings = new Dictionary<string, Settings.FontSetting>();
+
         public ChatTextManager(RadegastInstance instance, ITextPrinter textPrinter)
         {
             this.textPrinter = textPrinter;
@@ -75,9 +80,32 @@ public void Dispose()
         private void InitializeConfig()
         {
             Settings s = instance.GlobalSettings;
+            var serializer = new JavaScriptSerializer();
 
             if (s["chat_timestamps"].Type == OSDType.Unknown)
+            {
                 s["chat_timestamps"] = OSD.FromBoolean(true);
+            }
+            if (s["chat_fonts"].Type == OSDType.Unknown)
+            {
+                try
+                {
+                    s["chat_fonts"] = serializer.Serialize(Settings.DefaultFontSettings);
+                }
+                catch (Exception ex)
+                {
+                    System.Windows.Forms.MessageBox.Show("Failed to save default font settings: " + ex.Message);
+                }
+            }
+
+            try
+            {
+                fontSettings = serializer.Deserialize<Dictionary<string, Settings.FontSetting>>(s["chat_fonts"]);
+            }
+            catch (Exception ex)
+            {
+                System.Windows.Forms.MessageBox.Show("Failed to read chat font settings: " + ex.Message);
+            }
 
             showTimestamps = s["chat_timestamps"].AsBoolean();
 
@@ -91,6 +119,19 @@ void s_OnSettingChanged(object sender, SettingsEventArgs e)
                 showTimestamps = e.Value.AsBoolean();
                 ReprintAllText();
             }
+            else if(e.Key == "chat_fonts")
+            {
+                try
+                {
+                    var serializer = new JavaScriptSerializer();
+                    fontSettings = serializer.Deserialize<Dictionary<string, Settings.FontSetting>>(e.Value);
+                }
+                catch (Exception ex)
+                {
+                    System.Windows.Forms.MessageBox.Show("Failed to read new font settings: " + ex.Message);
+                }
+                ReprintAllText();
+            }
         }
 
         private void netcom_ChatSent(object sender, ChatSentEventArgs e)
@@ -143,59 +184,60 @@ public void ProcessBufferItem(ChatBufferItem item, bool addToBuffer)
 
                 if (showTimestamps)
                 {
-                    textPrinter.ForeColor = SystemColors.GrayText;
-                    textPrinter.PrintText(item.Timestamp.ToString("[HH:mm] "));
+                    if(fontSettings.ContainsKey("Timestamp"))
+                    {
+                        var fontSetting = fontSettings["Timestamp"];
+                        textPrinter.ForeColor = fontSetting.ForeColor;
+                        textPrinter.BackColor = fontSetting.BackColor;
+                        textPrinter.Font = fontSetting.Font;
+                        textPrinter.PrintText(item.Timestamp.ToString("[HH:mm] "));
+                    }
+                    else
+                    {
+                        textPrinter.ForeColor = SystemColors.GrayText;
+                        textPrinter.BackColor = Color.Transparent;
+                        textPrinter.Font = Settings.FontSetting.DefaultFont;
+                        textPrinter.PrintText(item.Timestamp.ToString("[HH:mm] "));
+                    }
                 }
 
-                switch (item.Style)
+                if(fontSettings.ContainsKey("Name"))
                 {
-                    case ChatBufferTextStyle.Normal:
-                        textPrinter.ForeColor = SystemColors.WindowText;
-                        break;
-
-                    case ChatBufferTextStyle.StatusBlue:
-                        textPrinter.ForeColor = Color.Blue;
-                        break;
-
-                    case ChatBufferTextStyle.StatusDarkBlue:
-                        textPrinter.ForeColor = Color.DarkBlue;
-                        break;
-
-                    case ChatBufferTextStyle.LindenChat:
-                        textPrinter.ForeColor = Color.DarkGreen;
-                        break;
-
-                    case ChatBufferTextStyle.ObjectChat:
-                        textPrinter.ForeColor = Color.DarkCyan;
-                        break;
-
-                    case ChatBufferTextStyle.StartupTitle:
-                        textPrinter.ForeColor = SystemColors.WindowText;
-                        textPrinter.Font = new Font(textPrinter.Font, FontStyle.Bold);
-                        break;
-
-                    case ChatBufferTextStyle.Alert:
-                        textPrinter.ForeColor = Color.DarkRed;
-                        break;
-
-                    case ChatBufferTextStyle.Error:
-                        textPrinter.ForeColor = Color.Red;
-                        break;
-
-                    case ChatBufferTextStyle.OwnerSay:
-                        textPrinter.ForeColor = Color.FromArgb(255, 180, 150, 0);
-                        break;
+                    var fontSetting = fontSettings["Name"];
+                    textPrinter.ForeColor = fontSetting.ForeColor;
+                    textPrinter.BackColor = fontSetting.BackColor;
+                    textPrinter.Font = fontSetting.Font;
+                }
+                else
+                {
+                    textPrinter.ForeColor = SystemColors.WindowText;
+                    textPrinter.BackColor = Color.Transparent;
+                    textPrinter.Font = Settings.FontSetting.DefaultFont;
                 }
 
                 if (item.Style == ChatBufferTextStyle.Normal && item.ID != UUID.Zero && instance.GlobalSettings["av_name_link"])
                 {
                     textPrinter.InsertLink(item.From, string.Format("secondlife:///app/agent/{0}/about", item.ID));
-                    textPrinter.PrintTextLine(item.Text);
                 }
                 else
                 {
-                    textPrinter.PrintTextLine(item.From + item.Text);
+                    textPrinter.PrintText(item.From);
                 }
+
+                if(fontSettings.ContainsKey(item.Style.ToString()))
+                {
+                    var fontSetting = fontSettings[item.Style.ToString()];
+                    textPrinter.ForeColor = fontSetting.ForeColor;
+                    textPrinter.BackColor = fontSetting.BackColor;
+                    textPrinter.Font = fontSetting.Font;
+                }
+                else
+                {
+                    textPrinter.ForeColor = SystemColors.WindowText;
+                    textPrinter.BackColor = Color.Transparent;
+                    textPrinter.Font = Settings.FontSetting.DefaultFont;
+                }
+                textPrinter.PrintTextLine(item.Text);
             }
         }
 
@@ -315,15 +357,34 @@ private void ProcessIncomingChat(ChatEventArgs e)
             switch (e.SourceType)
             {
                 case ChatSourceType.Agent:
-                    item.Style =
-                        (e.FromName.EndsWith("Linden") ?
-                        ChatBufferTextStyle.LindenChat : ChatBufferTextStyle.Normal);
+                    if(e.FromName.EndsWith("Linden"))
+                    {
+                        item.Style = ChatBufferTextStyle.LindenChat;
+                    }
+                    else if(isEmote)
+                    {
+                        item.Style = ChatBufferTextStyle.Emote;
+                    }
+                    else if(e.SourceID == client.Self.AgentID)
+                    {
+                        item.Style = ChatBufferTextStyle.Self;
+                    }
+                    else
+                    {
+                        item.Style = ChatBufferTextStyle.Normal;
+                    }
                     break;
-
                 case ChatSourceType.Object:
                     if (e.Type == ChatType.OwnerSay)
                     {
-                        item.Style = ChatBufferTextStyle.OwnerSay;
+                        if(isEmote)
+                        {
+                            item.Style = ChatBufferTextStyle.Emote;
+                        }
+                        else
+                        {
+                            item.Style = ChatBufferTextStyle.OwnerSay;
+                        }
                     }
                     else if (e.Type == ChatType.Debug)
                     {