Merge branch 'master' into presence-refactor

OpenSim/Client/Sirikata/Protocol/MessageHeader.cs

@@ -0,0 +1,630 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+
+using pb = global::Google.ProtocolBuffers;
+using pbc = global::Google.ProtocolBuffers.Collections;
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using scg = global::System.Collections.Generic;
+namespace Sirikata.Protocol._PBJ_Internal {
+  
+  public static partial class MessageHeader {
+  
+    #region Extension registration
+    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
+    }
+    #endregion
+    #region Static variables
+    internal static pbd::MessageDescriptor internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Protocol._PBJ_Internal.Header, global::Sirikata.Protocol._PBJ_Internal.Header.Builder> internal__static_Sirikata_Protocol__PBJ_Internal_Header__FieldAccessorTable;
+    #endregion
+    #region Descriptor
+    public static pbd::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbd::FileDescriptor descriptor;
+    
+    static MessageHeader() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          "ChNNZXNzYWdlSGVhZGVyLnByb3RvEh9TaXJpa2F0YS5Qcm90b2NvbC5fUEJK" + 
+          "X0ludGVybmFsIooDCgZIZWFkZXISFQoNc291cmNlX29iamVjdBgBIAEoDBIT" + 
+          "Cgtzb3VyY2VfcG9ydBgDIAEoDRIVCgxzb3VyY2Vfc3BhY2UYgAwgASgMEhoK" + 
+          "EmRlc3RpbmF0aW9uX29iamVjdBgCIAEoDBIYChBkZXN0aW5hdGlvbl9wb3J0" + 
+          "GAQgASgNEhoKEWRlc3RpbmF0aW9uX3NwYWNlGIEMIAEoDBIKCgJpZBgHIAEo" + 
+          "AxIQCghyZXBseV9pZBgIIAEoAxJMCg1yZXR1cm5fc3RhdHVzGIAOIAEoDjI0" + 
+          "LlNpcmlrYXRhLlByb3RvY29sLl9QQkpfSW50ZXJuYWwuSGVhZGVyLlJldHVy" + 
+          "blN0YXR1cyJ/CgxSZXR1cm5TdGF0dXMSCwoHU1VDQ0VTUxAAEhMKD05FVFdP" + 
+          "UktfRkFJTFVSRRABEhMKD1RJTUVPVVRfRkFJTFVSRRADEhIKDlBST1RPQ09M" + 
+          "X0VSUk9SEAQSEAoMUE9SVF9GQUlMVVJFEAUSEgoOVU5LTk9XTl9PQkpFQ1QQ" + 
+          "Bg==");
+      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
+        descriptor = root;
+        internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor = Descriptor.MessageTypes[0];
+        internal__static_Sirikata_Protocol__PBJ_Internal_Header__FieldAccessorTable = 
+            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Protocol._PBJ_Internal.Header, global::Sirikata.Protocol._PBJ_Internal.Header.Builder>(internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor,
+                new string[] { "SourceObject", "SourcePort", "SourceSpace", "DestinationObject", "DestinationPort", "DestinationSpace", "Id", "ReplyId", "ReturnStatus", });
+        return null;
+      };
+      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
+          new pbd::FileDescriptor[] {
+          }, assigner);
+    }
+    #endregion
+    
+  }
+  #region Messages
+  public sealed partial class Header : pb::GeneratedMessage<Header, Header.Builder> {
+    private static readonly Header defaultInstance = new Builder().BuildPartial();
+    public static Header DefaultInstance {
+      get { return defaultInstance; }
+    }
+    
+    public override Header DefaultInstanceForType {
+      get { return defaultInstance; }
+    }
+    
+    protected override Header ThisMessage {
+      get { return this; }
+    }
+    
+    public static pbd::MessageDescriptor Descriptor {
+      get { return global::Sirikata.Protocol._PBJ_Internal.MessageHeader.internal__static_Sirikata_Protocol__PBJ_Internal_Header__Descriptor; }
+    }
+    
+    protected override pb::FieldAccess.FieldAccessorTable<Header, Header.Builder> InternalFieldAccessors {
+      get { return global::Sirikata.Protocol._PBJ_Internal.MessageHeader.internal__static_Sirikata_Protocol__PBJ_Internal_Header__FieldAccessorTable; }
+    }
+    
+    #region Nested types
+    public static class Types {
+      public enum ReturnStatus {
+        SUCCESS = 0,
+        NETWORK_FAILURE = 1,
+        TIMEOUT_FAILURE = 3,
+        PROTOCOL_ERROR = 4,
+        PORT_FAILURE = 5,
+        UNKNOWN_OBJECT = 6,
+      }
+      
+    }
+    #endregion
+    
+    public const int SourceObjectFieldNumber = 1;
+    private bool hasSourceObject;
+    private pb::ByteString sourceObject_ = pb::ByteString.Empty;
+    public bool HasSourceObject {
+      get { return hasSourceObject; }
+    }
+    public pb::ByteString SourceObject {
+      get { return sourceObject_; }
+    }
+    
+    public const int SourcePortFieldNumber = 3;
+    private bool hasSourcePort;
+    private uint sourcePort_ = 0;
+    public bool HasSourcePort {
+      get { return hasSourcePort; }
+    }
+    [global::System.CLSCompliant(false)]
+    public uint SourcePort {
+      get { return sourcePort_; }
+    }
+    
+    public const int SourceSpaceFieldNumber = 1536;
+    private bool hasSourceSpace;
+    private pb::ByteString sourceSpace_ = pb::ByteString.Empty;
+    public bool HasSourceSpace {
+      get { return hasSourceSpace; }
+    }
+    public pb::ByteString SourceSpace {
+      get { return sourceSpace_; }
+    }
+    
+    public const int DestinationObjectFieldNumber = 2;
+    private bool hasDestinationObject;
+    private pb::ByteString destinationObject_ = pb::ByteString.Empty;
+    public bool HasDestinationObject {
+      get { return hasDestinationObject; }
+    }
+    public pb::ByteString DestinationObject {
+      get { return destinationObject_; }
+    }
+    
+    public const int DestinationPortFieldNumber = 4;
+    private bool hasDestinationPort;
+    private uint destinationPort_ = 0;
+    public bool HasDestinationPort {
+      get { return hasDestinationPort; }
+    }
+    [global::System.CLSCompliant(false)]
+    public uint DestinationPort {
+      get { return destinationPort_; }
+    }
+    
+    public const int DestinationSpaceFieldNumber = 1537;
+    private bool hasDestinationSpace;
+    private pb::ByteString destinationSpace_ = pb::ByteString.Empty;
+    public bool HasDestinationSpace {
+      get { return hasDestinationSpace; }
+    }
+    public pb::ByteString DestinationSpace {
+      get { return destinationSpace_; }
+    }
+    
+    public const int IdFieldNumber = 7;
+    private bool hasId;
+    private long id_ = 0L;
+    public bool HasId {
+      get { return hasId; }
+    }
+    public long Id {
+      get { return id_; }
+    }
+    
+    public const int ReplyIdFieldNumber = 8;
+    private bool hasReplyId;
+    private long replyId_ = 0L;
+    public bool HasReplyId {
+      get { return hasReplyId; }
+    }
+    public long ReplyId {
+      get { return replyId_; }
+    }
+    
+    public const int ReturnStatusFieldNumber = 1792;
+    private bool hasReturnStatus;
+    private global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus returnStatus_ = global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus.SUCCESS;
+    public bool HasReturnStatus {
+      get { return hasReturnStatus; }
+    }
+    public global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus ReturnStatus {
+      get { return returnStatus_; }
+    }
+    
+    public override bool IsInitialized {
+      get {
+        return true;
+      }
+    }
+    
+    public override void WriteTo(pb::CodedOutputStream output) {
+      if (HasSourceObject) {
+        output.WriteBytes(1, SourceObject);
+      }
+      if (HasDestinationObject) {
+        output.WriteBytes(2, DestinationObject);
+      }
+      if (HasSourcePort) {
+        output.WriteUInt32(3, SourcePort);
+      }
+      if (HasDestinationPort) {
+        output.WriteUInt32(4, DestinationPort);
+      }
+      if (HasId) {
+        output.WriteInt64(7, Id);
+      }
+      if (HasReplyId) {
+        output.WriteInt64(8, ReplyId);
+      }
+      if (HasSourceSpace) {
+        output.WriteBytes(1536, SourceSpace);
+      }
+      if (HasDestinationSpace) {
+        output.WriteBytes(1537, DestinationSpace);
+      }
+      if (HasReturnStatus) {
+        output.WriteEnum(1792, (int) ReturnStatus);
+      }
+      UnknownFields.WriteTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public override int SerializedSize {
+      get {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+        
+        size = 0;
+        if (HasSourceObject) {
+          size += pb::CodedOutputStream.ComputeBytesSize(1, SourceObject);
+        }
+        if (HasSourcePort) {
+          size += pb::CodedOutputStream.ComputeUInt32Size(3, SourcePort);
+        }
+        if (HasSourceSpace) {
+          size += pb::CodedOutputStream.ComputeBytesSize(1536, SourceSpace);
+        }
+        if (HasDestinationObject) {
+          size += pb::CodedOutputStream.ComputeBytesSize(2, DestinationObject);
+        }
+        if (HasDestinationPort) {
+          size += pb::CodedOutputStream.ComputeUInt32Size(4, DestinationPort);
+        }
+        if (HasDestinationSpace) {
+          size += pb::CodedOutputStream.ComputeBytesSize(1537, DestinationSpace);
+        }
+        if (HasId) {
+          size += pb::CodedOutputStream.ComputeInt64Size(7, Id);
+        }
+        if (HasReplyId) {
+          size += pb::CodedOutputStream.ComputeInt64Size(8, ReplyId);
+        }
+        if (HasReturnStatus) {
+          size += pb::CodedOutputStream.ComputeEnumSize(1792, (int) ReturnStatus);
+        }
+        size += UnknownFields.SerializedSize;
+        memoizedSerializedSize = size;
+        return size;
+      }
+    }
+    
+    public static Header ParseFrom(pb::ByteString data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Header ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Header ParseFrom(byte[] data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Header ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Header ParseFrom(global::System.IO.Stream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Header ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Header ParseDelimitedFrom(global::System.IO.Stream input) {
+      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+    }
+    public static Header ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+    }
+    public static Header ParseFrom(pb::CodedInputStream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Header ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Builder CreateBuilder() { return new Builder(); }
+    public override Builder ToBuilder() { return CreateBuilder(this); }
+    public override Builder CreateBuilderForType() { return new Builder(); }
+    public static Builder CreateBuilder(Header prototype) {
+      return (Builder) new Builder().MergeFrom(prototype);
+    }
+    
+    public sealed partial class Builder : pb::GeneratedBuilder<Header, Builder> {
+      protected override Builder ThisBuilder {
+        get { return this; }
+      }
+      public Builder() {}
+      
+      Header result = new Header();
+      
+      protected override Header MessageBeingBuilt {
+        get { return result; }
+      }
+      
+      public override Builder Clear() {
+        result = new Header();
+        return this;
+      }
+      
+      public override Builder Clone() {
+        return new Builder().MergeFrom(result);
+      }
+      
+      public override pbd::MessageDescriptor DescriptorForType {
+        get { return global::Sirikata.Protocol._PBJ_Internal.Header.Descriptor; }
+      }
+      
+      public override Header DefaultInstanceForType {
+        get { return global::Sirikata.Protocol._PBJ_Internal.Header.DefaultInstance; }
+      }
+      
+      public override Header BuildPartial() {
+        if (result == null) {
+          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+        }
+        Header returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public override Builder MergeFrom(pb::IMessage other) {
+        if (other is Header) {
+          return MergeFrom((Header) other);
+        } else {
+          base.MergeFrom(other);
+          return this;
+        }
+      }
+      
+      public override Builder MergeFrom(Header other) {
+        if (other == global::Sirikata.Protocol._PBJ_Internal.Header.DefaultInstance) return this;
+        if (other.HasSourceObject) {
+          SourceObject = other.SourceObject;
+        }
+        if (other.HasSourcePort) {
+          SourcePort = other.SourcePort;
+        }
+        if (other.HasSourceSpace) {
+          SourceSpace = other.SourceSpace;
+        }
+        if (other.HasDestinationObject) {
+          DestinationObject = other.DestinationObject;
+        }
+        if (other.HasDestinationPort) {
+          DestinationPort = other.DestinationPort;
+        }
+        if (other.HasDestinationSpace) {
+          DestinationSpace = other.DestinationSpace;
+        }
+        if (other.HasId) {
+          Id = other.Id;
+        }
+        if (other.HasReplyId) {
+          ReplyId = other.ReplyId;
+        }
+        if (other.HasReturnStatus) {
+          ReturnStatus = other.ReturnStatus;
+        }
+        this.MergeUnknownFields(other.UnknownFields);
+        return this;
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input) {
+        return MergeFrom(input, pb::ExtensionRegistry.Empty);
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        pb::UnknownFieldSet.Builder unknownFields = null;
+        while (true) {
+          uint tag = input.ReadTag();
+          switch (tag) {
+            case 0: {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            default: {
+              if (pb::WireFormat.IsEndGroupTag(tag)) {
+                if (unknownFields != null) {
+                  this.UnknownFields = unknownFields.Build();
+                }
+                return this;
+              }
+              if (unknownFields == null) {
+                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+              }
+              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
+              break;
+            }
+            case 10: {
+              SourceObject = input.ReadBytes();
+              break;
+            }
+            case 18: {
+              DestinationObject = input.ReadBytes();
+              break;
+            }
+            case 24: {
+              SourcePort = input.ReadUInt32();
+              break;
+            }
+            case 32: {
+              DestinationPort = input.ReadUInt32();
+              break;
+            }
+            case 56: {
+              Id = input.ReadInt64();
+              break;
+            }
+            case 64: {
+              ReplyId = input.ReadInt64();
+              break;
+            }
+            case 12290: {
+              SourceSpace = input.ReadBytes();
+              break;
+            }
+            case 12298: {
+              DestinationSpace = input.ReadBytes();
+              break;
+            }
+            case 14336: {
+              int rawValue = input.ReadEnum();
+              if (!global::System.Enum.IsDefined(typeof(global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus), rawValue)) {
+                if (unknownFields == null) {
+                  unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+                }
+                unknownFields.MergeVarintField(1792, (ulong) rawValue);
+              } else {
+                ReturnStatus = (global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus) rawValue;
+              }
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      public bool HasSourceObject {
+        get { return result.HasSourceObject; }
+      }
+      public pb::ByteString SourceObject {
+        get { return result.SourceObject; }
+        set { SetSourceObject(value); }
+      }
+      public Builder SetSourceObject(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasSourceObject = true;
+        result.sourceObject_ = value;
+        return this;
+      }
+      public Builder ClearSourceObject() {
+        result.hasSourceObject = false;
+        result.sourceObject_ = pb::ByteString.Empty;
+        return this;
+      }
+      
+      public bool HasSourcePort {
+        get { return result.HasSourcePort; }
+      }
+      [global::System.CLSCompliant(false)]
+      public uint SourcePort {
+        get { return result.SourcePort; }
+        set { SetSourcePort(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetSourcePort(uint value) {
+        result.hasSourcePort = true;
+        result.sourcePort_ = value;
+        return this;
+      }
+      public Builder ClearSourcePort() {
+        result.hasSourcePort = false;
+        result.sourcePort_ = 0;
+        return this;
+      }
+      
+      public bool HasSourceSpace {
+        get { return result.HasSourceSpace; }
+      }
+      public pb::ByteString SourceSpace {
+        get { return result.SourceSpace; }
+        set { SetSourceSpace(value); }
+      }
+      public Builder SetSourceSpace(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasSourceSpace = true;
+        result.sourceSpace_ = value;
+        return this;
+      }
+      public Builder ClearSourceSpace() {
+        result.hasSourceSpace = false;
+        result.sourceSpace_ = pb::ByteString.Empty;
+        return this;
+      }
+      
+      public bool HasDestinationObject {
+        get { return result.HasDestinationObject; }
+      }
+      public pb::ByteString DestinationObject {
+        get { return result.DestinationObject; }
+        set { SetDestinationObject(value); }
+      }
+      public Builder SetDestinationObject(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasDestinationObject = true;
+        result.destinationObject_ = value;
+        return this;
+      }
+      public Builder ClearDestinationObject() {
+        result.hasDestinationObject = false;
+        result.destinationObject_ = pb::ByteString.Empty;
+        return this;
+      }
+      
+      public bool HasDestinationPort {
+        get { return result.HasDestinationPort; }
+      }
+      [global::System.CLSCompliant(false)]
+      public uint DestinationPort {
+        get { return result.DestinationPort; }
+        set { SetDestinationPort(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetDestinationPort(uint value) {
+        result.hasDestinationPort = true;
+        result.destinationPort_ = value;
+        return this;
+      }
+      public Builder ClearDestinationPort() {
+        result.hasDestinationPort = false;
+        result.destinationPort_ = 0;
+        return this;
+      }
+      
+      public bool HasDestinationSpace {
+        get { return result.HasDestinationSpace; }
+      }
+      public pb::ByteString DestinationSpace {
+        get { return result.DestinationSpace; }
+        set { SetDestinationSpace(value); }
+      }
+      public Builder SetDestinationSpace(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasDestinationSpace = true;
+        result.destinationSpace_ = value;
+        return this;
+      }
+      public Builder ClearDestinationSpace() {
+        result.hasDestinationSpace = false;
+        result.destinationSpace_ = pb::ByteString.Empty;
+        return this;
+      }
+      
+      public bool HasId {
+        get { return result.HasId; }
+      }
+      public long Id {
+        get { return result.Id; }
+        set { SetId(value); }
+      }
+      public Builder SetId(long value) {
+        result.hasId = true;
+        result.id_ = value;
+        return this;
+      }
+      public Builder ClearId() {
+        result.hasId = false;
+        result.id_ = 0L;
+        return this;
+      }
+      
+      public bool HasReplyId {
+        get { return result.HasReplyId; }
+      }
+      public long ReplyId {
+        get { return result.ReplyId; }
+        set { SetReplyId(value); }
+      }
+      public Builder SetReplyId(long value) {
+        result.hasReplyId = true;
+        result.replyId_ = value;
+        return this;
+      }
+      public Builder ClearReplyId() {
+        result.hasReplyId = false;
+        result.replyId_ = 0L;
+        return this;
+      }
+      
+      public bool HasReturnStatus {
+       get { return result.HasReturnStatus; }
+      }
+      public global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus ReturnStatus {
+        get { return result.ReturnStatus; }
+        set { SetReturnStatus(value); }
+      }
+      public Builder SetReturnStatus(global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus value) {
+        result.hasReturnStatus = true;
+        result.returnStatus_ = value;
+        return this;
+      }
+      public Builder ClearReturnStatus() {
+        result.hasReturnStatus = false;
+        result.returnStatus_ = global::Sirikata.Protocol._PBJ_Internal.Header.Types.ReturnStatus.SUCCESS;
+        return this;
+      }
+    }
+    static Header() {
+      object.ReferenceEquals(global::Sirikata.Protocol._PBJ_Internal.MessageHeader.Descriptor, null);
+    }
+  }
+  
+  #endregion
+  
+}

OpenSim/Client/Sirikata/Protocol/MessageHeader.pbj.cs

@@ -0,0 +1,312 @@
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using pb = global::Google.ProtocolBuffers;
+namespace Sirikata.Protocol {
+    public class Header : PBJ.IMessage {
+        protected _PBJ_Internal.Header super;
+        public _PBJ_Internal.Header _PBJSuper{ get { return super;} }
+        public Header() {
+            super=new _PBJ_Internal.Header();
+        }
+        public Header(_PBJ_Internal.Header reference) {
+            super=reference;
+        }
+        public static Header defaultInstance= new Header (_PBJ_Internal.Header.DefaultInstance);
+        public static Header DefaultInstance{
+            get {return defaultInstance;}
+        }
+        public static pbd.MessageDescriptor Descriptor {
+            get { return _PBJ_Internal.Header.Descriptor; }        }
+        public static class Types {
+        public enum ReturnStatus {
+            SUCCESS=_PBJ_Internal.Header.Types.ReturnStatus.SUCCESS,
+            NETWORK_FAILURE=_PBJ_Internal.Header.Types.ReturnStatus.NETWORK_FAILURE,
+            TIMEOUT_FAILURE=_PBJ_Internal.Header.Types.ReturnStatus.TIMEOUT_FAILURE,
+            PROTOCOL_ERROR=_PBJ_Internal.Header.Types.ReturnStatus.PROTOCOL_ERROR,
+            PORT_FAILURE=_PBJ_Internal.Header.Types.ReturnStatus.PORT_FAILURE,
+            UNKNOWN_OBJECT=_PBJ_Internal.Header.Types.ReturnStatus.UNKNOWN_OBJECT
+        };
+        }
+        public static bool WithinReservedFieldTagRange(int field_tag) {
+            return false||(field_tag>=1&&field_tag<=8)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
+        }
+        public static bool WithinExtensionFieldTagRange(int field_tag) {
+            return false;
+        }
+        public const int SourceObjectFieldTag=1;
+        public bool HasSourceObject{ get {return super.HasSourceObject&&PBJ._PBJ.ValidateUuid(super.SourceObject);} }
+        public PBJ.UUID SourceObject{ get {
+            if (HasSourceObject) {
+                return PBJ._PBJ.CastUuid(super.SourceObject);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+        public const int SourcePortFieldTag=3;
+        public bool HasSourcePort{ get {return super.HasSourcePort&&PBJ._PBJ.ValidateUint32(super.SourcePort);} }
+        public uint SourcePort{ get {
+            if (HasSourcePort) {
+                return PBJ._PBJ.CastUint32(super.SourcePort);
+            } else {
+                return PBJ._PBJ.CastUint32();
+            }
+        }
+        }
+        public const int SourceSpaceFieldTag=1536;
+        public bool HasSourceSpace{ get {return super.HasSourceSpace&&PBJ._PBJ.ValidateUuid(super.SourceSpace);} }
+        public PBJ.UUID SourceSpace{ get {
+            if (HasSourceSpace) {
+                return PBJ._PBJ.CastUuid(super.SourceSpace);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+        public const int DestinationObjectFieldTag=2;
+        public bool HasDestinationObject{ get {return super.HasDestinationObject&&PBJ._PBJ.ValidateUuid(super.DestinationObject);} }
+        public PBJ.UUID DestinationObject{ get {
+            if (HasDestinationObject) {
+                return PBJ._PBJ.CastUuid(super.DestinationObject);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+        public const int DestinationPortFieldTag=4;
+        public bool HasDestinationPort{ get {return super.HasDestinationPort&&PBJ._PBJ.ValidateUint32(super.DestinationPort);} }
+        public uint DestinationPort{ get {
+            if (HasDestinationPort) {
+                return PBJ._PBJ.CastUint32(super.DestinationPort);
+            } else {
+                return PBJ._PBJ.CastUint32();
+            }
+        }
+        }
+        public const int DestinationSpaceFieldTag=1537;
+        public bool HasDestinationSpace{ get {return super.HasDestinationSpace&&PBJ._PBJ.ValidateUuid(super.DestinationSpace);} }
+        public PBJ.UUID DestinationSpace{ get {
+            if (HasDestinationSpace) {
+                return PBJ._PBJ.CastUuid(super.DestinationSpace);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+        public const int IdFieldTag=7;
+        public bool HasId{ get {return super.HasId&&PBJ._PBJ.ValidateInt64(super.Id);} }
+        public long Id{ get {
+            if (HasId) {
+                return PBJ._PBJ.CastInt64(super.Id);
+            } else {
+                return PBJ._PBJ.CastInt64();
+            }
+        }
+        }
+        public const int ReplyIdFieldTag=8;
+        public bool HasReplyId{ get {return super.HasReplyId&&PBJ._PBJ.ValidateInt64(super.ReplyId);} }
+        public long ReplyId{ get {
+            if (HasReplyId) {
+                return PBJ._PBJ.CastInt64(super.ReplyId);
+            } else {
+                return PBJ._PBJ.CastInt64();
+            }
+        }
+        }
+        public const int ReturnStatusFieldTag=1792;
+        public bool HasReturnStatus{ get {return super.HasReturnStatus;} }
+        public Types.ReturnStatus ReturnStatus{ get {
+            if (HasReturnStatus) {
+                return (Types.ReturnStatus)super.ReturnStatus;
+            } else {
+                return new Types.ReturnStatus();
+            }
+        }
+        }
+            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
+        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
+        public static Builder CreateBuilder() { return new Builder(); }
+        public static Builder CreateBuilder(Header prototype) {
+            return (Builder)new Builder().MergeFrom(prototype);
+        }
+        public static Header ParseFrom(pb::ByteString data) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data));
+        }
+        public static Header ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
+        }
+        public static Header ParseFrom(byte[] data) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data));
+        }
+        public static Header ParseFrom(byte[] data, pb::ExtensionRegistry er) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
+        }
+        public static Header ParseFrom(global::System.IO.Stream data) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data));
+        }
+        public static Header ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
+        }
+        public static Header ParseFrom(pb::CodedInputStream data) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data));
+        }
+        public static Header ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
+            return new Header(_PBJ_Internal.Header.ParseFrom(data,er));
+        }
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+        public class Builder : global::PBJ.IMessage.IBuilder{
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+            protected _PBJ_Internal.Header.Builder super;
+            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
+            public _PBJ_Internal.Header.Builder _PBJSuper{ get { return super;} }
+            public Builder() {super = new _PBJ_Internal.Header.Builder();}
+            public Builder(_PBJ_Internal.Header.Builder other) {
+                super=other;
+            }
+            public Builder Clone() {return new Builder(super.Clone());}
+            public Builder MergeFrom(Header prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
+            public Builder Clear() {super.Clear();return this;}
+            public Header BuildPartial() {return new Header(super.BuildPartial());}
+            public Header Build() {if (_HasAllPBJFields) return new Header(super.Build());return null;}
+            public pbd::MessageDescriptor DescriptorForType {
+                get { return Header.Descriptor; }            }
+        public Builder ClearSourceObject() { super.ClearSourceObject();return this;}
+        public const int SourceObjectFieldTag=1;
+        public bool HasSourceObject{ get {return super.HasSourceObject&&PBJ._PBJ.ValidateUuid(super.SourceObject);} }
+        public PBJ.UUID SourceObject{ get {
+            if (HasSourceObject) {
+                return PBJ._PBJ.CastUuid(super.SourceObject);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.SourceObject=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearSourcePort() { super.ClearSourcePort();return this;}
+        public const int SourcePortFieldTag=3;
+        public bool HasSourcePort{ get {return super.HasSourcePort&&PBJ._PBJ.ValidateUint32(super.SourcePort);} }
+        public uint SourcePort{ get {
+            if (HasSourcePort) {
+                return PBJ._PBJ.CastUint32(super.SourcePort);
+            } else {
+                return PBJ._PBJ.CastUint32();
+            }
+        }
+        set {
+            super.SourcePort=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearSourceSpace() { super.ClearSourceSpace();return this;}
+        public const int SourceSpaceFieldTag=1536;
+        public bool HasSourceSpace{ get {return super.HasSourceSpace&&PBJ._PBJ.ValidateUuid(super.SourceSpace);} }
+        public PBJ.UUID SourceSpace{ get {
+            if (HasSourceSpace) {
+                return PBJ._PBJ.CastUuid(super.SourceSpace);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.SourceSpace=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearDestinationObject() { super.ClearDestinationObject();return this;}
+        public const int DestinationObjectFieldTag=2;
+        public bool HasDestinationObject{ get {return super.HasDestinationObject&&PBJ._PBJ.ValidateUuid(super.DestinationObject);} }
+        public PBJ.UUID DestinationObject{ get {
+            if (HasDestinationObject) {
+                return PBJ._PBJ.CastUuid(super.DestinationObject);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.DestinationObject=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearDestinationPort() { super.ClearDestinationPort();return this;}
+        public const int DestinationPortFieldTag=4;
+        public bool HasDestinationPort{ get {return super.HasDestinationPort&&PBJ._PBJ.ValidateUint32(super.DestinationPort);} }
+        public uint DestinationPort{ get {
+            if (HasDestinationPort) {
+                return PBJ._PBJ.CastUint32(super.DestinationPort);
+            } else {
+                return PBJ._PBJ.CastUint32();
+            }
+        }
+        set {
+            super.DestinationPort=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearDestinationSpace() { super.ClearDestinationSpace();return this;}
+        public const int DestinationSpaceFieldTag=1537;
+        public bool HasDestinationSpace{ get {return super.HasDestinationSpace&&PBJ._PBJ.ValidateUuid(super.DestinationSpace);} }
+        public PBJ.UUID DestinationSpace{ get {
+            if (HasDestinationSpace) {
+                return PBJ._PBJ.CastUuid(super.DestinationSpace);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.DestinationSpace=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearId() { super.ClearId();return this;}
+        public const int IdFieldTag=7;
+        public bool HasId{ get {return super.HasId&&PBJ._PBJ.ValidateInt64(super.Id);} }
+        public long Id{ get {
+            if (HasId) {
+                return PBJ._PBJ.CastInt64(super.Id);
+            } else {
+                return PBJ._PBJ.CastInt64();
+            }
+        }
+        set {
+            super.Id=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearReplyId() { super.ClearReplyId();return this;}
+        public const int ReplyIdFieldTag=8;
+        public bool HasReplyId{ get {return super.HasReplyId&&PBJ._PBJ.ValidateInt64(super.ReplyId);} }
+        public long ReplyId{ get {
+            if (HasReplyId) {
+                return PBJ._PBJ.CastInt64(super.ReplyId);
+            } else {
+                return PBJ._PBJ.CastInt64();
+            }
+        }
+        set {
+            super.ReplyId=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearReturnStatus() { super.ClearReturnStatus();return this;}
+        public const int ReturnStatusFieldTag=1792;
+        public bool HasReturnStatus{ get {return super.HasReturnStatus;} }
+        public Types.ReturnStatus ReturnStatus{ get {
+            if (HasReturnStatus) {
+                return (Types.ReturnStatus)super.ReturnStatus;
+            } else {
+                return new Types.ReturnStatus();
+            }
+        }
+        set {
+            super.ReturnStatus=((_PBJ_Internal.Header.Types.ReturnStatus)value);
+        }
+        }
+        }
+    }
+}

OpenSim/Client/Sirikata/Protocol/Physics.cs

@@ -0,0 +1,840 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+
+using pb = global::Google.ProtocolBuffers;
+using pbc = global::Google.ProtocolBuffers.Collections;
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using scg = global::System.Collections.Generic;
+namespace Sirikata.Physics.Protocol._PBJ_Internal {
+  
+  public static partial class Physics {
+  
+    #region Extension registration
+    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
+    }
+    #endregion
+    #region Static variables
+    internal static pbd::MessageDescriptor internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.Builder> internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__FieldAccessorTable;
+    internal static pbd::MessageDescriptor internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.Builder> internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__FieldAccessorTable;
+    #endregion
+    #region Descriptor
+    public static pbd::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbd::FileDescriptor descriptor;
+    
+    static Physics() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          "Cg1QaHlzaWNzLnByb3RvEidTaXJpa2F0YS5QaHlzaWNzLlByb3RvY29sLl9Q" + 
+          "QkpfSW50ZXJuYWwiqAEKDkNvbGxpc2lvbkJlZ2luEhEKCXRpbWVzdGFtcBgC" + 
+          "IAEoBhIZCg10aGlzX3Bvc2l0aW9uGAMgAygBQgIQARIaCg5vdGhlcl9wb3Np" + 
+          "dGlvbhgEIAMoAUICEAESFwoLdGhpc19ub3JtYWwYBSADKAJCAhABEhMKB2lt" + 
+          "cHVsc2UYBiADKAJCAhABEh4KFm90aGVyX29iamVjdF9yZWZlcmVuY2UYByAB" + 
+          "KAwiQQoMQ29sbGlzaW9uRW5kEhEKCXRpbWVzdGFtcBgCIAEoBhIeChZvdGhl" + 
+          "cl9vYmplY3RfcmVmZXJlbmNlGAYgASgM");
+      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
+        descriptor = root;
+        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor = Descriptor.MessageTypes[0];
+        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__FieldAccessorTable = 
+            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.Builder>(internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor,
+                new string[] { "Timestamp", "ThisPosition", "OtherPosition", "ThisNormal", "Impulse", "OtherObjectReference", });
+        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor = Descriptor.MessageTypes[1];
+        internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__FieldAccessorTable = 
+            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd, global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.Builder>(internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor,
+                new string[] { "Timestamp", "OtherObjectReference", });
+        return null;
+      };
+      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
+          new pbd::FileDescriptor[] {
+          }, assigner);
+    }
+    #endregion
+    
+  }
+  #region Messages
+  public sealed partial class CollisionBegin : pb::GeneratedMessage<CollisionBegin, CollisionBegin.Builder> {
+    private static readonly CollisionBegin defaultInstance = new Builder().BuildPartial();
+    public static CollisionBegin DefaultInstance {
+      get { return defaultInstance; }
+    }
+    
+    public override CollisionBegin DefaultInstanceForType {
+      get { return defaultInstance; }
+    }
+    
+    protected override CollisionBegin ThisMessage {
+      get { return this; }
+    }
+    
+    public static pbd::MessageDescriptor Descriptor {
+      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__Descriptor; }
+    }
+    
+    protected override pb::FieldAccess.FieldAccessorTable<CollisionBegin, CollisionBegin.Builder> InternalFieldAccessors {
+      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionBegin__FieldAccessorTable; }
+    }
+    
+    public const int TimestampFieldNumber = 2;
+    private bool hasTimestamp;
+    private ulong timestamp_ = 0;
+    public bool HasTimestamp {
+      get { return hasTimestamp; }
+    }
+    [global::System.CLSCompliant(false)]
+    public ulong Timestamp {
+      get { return timestamp_; }
+    }
+    
+    public const int ThisPositionFieldNumber = 3;
+    private int thisPositionMemoizedSerializedSize;
+    private pbc::PopsicleList<double> thisPosition_ = new pbc::PopsicleList<double>();
+    public scg::IList<double> ThisPositionList {
+      get { return pbc::Lists.AsReadOnly(thisPosition_); }
+    }
+    public int ThisPositionCount {
+      get { return thisPosition_.Count; }
+    }
+    public double GetThisPosition(int index) {
+      return thisPosition_[index];
+    }
+    
+    public const int OtherPositionFieldNumber = 4;
+    private int otherPositionMemoizedSerializedSize;
+    private pbc::PopsicleList<double> otherPosition_ = new pbc::PopsicleList<double>();
+    public scg::IList<double> OtherPositionList {
+      get { return pbc::Lists.AsReadOnly(otherPosition_); }
+    }
+    public int OtherPositionCount {
+      get { return otherPosition_.Count; }
+    }
+    public double GetOtherPosition(int index) {
+      return otherPosition_[index];
+    }
+    
+    public const int ThisNormalFieldNumber = 5;
+    private int thisNormalMemoizedSerializedSize;
+    private pbc::PopsicleList<float> thisNormal_ = new pbc::PopsicleList<float>();
+    public scg::IList<float> ThisNormalList {
+      get { return pbc::Lists.AsReadOnly(thisNormal_); }
+    }
+    public int ThisNormalCount {
+      get { return thisNormal_.Count; }
+    }
+    public float GetThisNormal(int index) {
+      return thisNormal_[index];
+    }
+    
+    public const int ImpulseFieldNumber = 6;
+    private int impulseMemoizedSerializedSize;
+    private pbc::PopsicleList<float> impulse_ = new pbc::PopsicleList<float>();
+    public scg::IList<float> ImpulseList {
+      get { return pbc::Lists.AsReadOnly(impulse_); }
+    }
+    public int ImpulseCount {
+      get { return impulse_.Count; }
+    }
+    public float GetImpulse(int index) {
+      return impulse_[index];
+    }
+    
+    public const int OtherObjectReferenceFieldNumber = 7;
+    private bool hasOtherObjectReference;
+    private pb::ByteString otherObjectReference_ = pb::ByteString.Empty;
+    public bool HasOtherObjectReference {
+      get { return hasOtherObjectReference; }
+    }
+    public pb::ByteString OtherObjectReference {
+      get { return otherObjectReference_; }
+    }
+    
+    public override bool IsInitialized {
+      get {
+        return true;
+      }
+    }
+    
+    public override void WriteTo(pb::CodedOutputStream output) {
+      if (HasTimestamp) {
+        output.WriteFixed64(2, Timestamp);
+      }
+      if (thisPosition_.Count > 0) {
+        output.WriteRawVarint32(26);
+        output.WriteRawVarint32((uint) thisPositionMemoizedSerializedSize);
+        foreach (double element in thisPosition_) {
+          output.WriteDoubleNoTag(element);
+        }
+      }
+      if (otherPosition_.Count > 0) {
+        output.WriteRawVarint32(34);
+        output.WriteRawVarint32((uint) otherPositionMemoizedSerializedSize);
+        foreach (double element in otherPosition_) {
+          output.WriteDoubleNoTag(element);
+        }
+      }
+      if (thisNormal_.Count > 0) {
+        output.WriteRawVarint32(42);
+        output.WriteRawVarint32((uint) thisNormalMemoizedSerializedSize);
+        foreach (float element in thisNormal_) {
+          output.WriteFloatNoTag(element);
+        }
+      }
+      if (impulse_.Count > 0) {
+        output.WriteRawVarint32(50);
+        output.WriteRawVarint32((uint) impulseMemoizedSerializedSize);
+        foreach (float element in impulse_) {
+          output.WriteFloatNoTag(element);
+        }
+      }
+      if (HasOtherObjectReference) {
+        output.WriteBytes(7, OtherObjectReference);
+      }
+      UnknownFields.WriteTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public override int SerializedSize {
+      get {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+        
+        size = 0;
+        if (HasTimestamp) {
+          size += pb::CodedOutputStream.ComputeFixed64Size(2, Timestamp);
+        }
+        {
+          int dataSize = 0;
+          dataSize = 8 * thisPosition_.Count;
+          size += dataSize;
+          if (thisPosition_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
+          thisPositionMemoizedSerializedSize = dataSize;
+        }
+        {
+          int dataSize = 0;
+          dataSize = 8 * otherPosition_.Count;
+          size += dataSize;
+          if (otherPosition_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
+          otherPositionMemoizedSerializedSize = dataSize;
+        }
+        {
+          int dataSize = 0;
+          dataSize = 4 * thisNormal_.Count;
+          size += dataSize;
+          if (thisNormal_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
+          thisNormalMemoizedSerializedSize = dataSize;
+        }
+        {
+          int dataSize = 0;
+          dataSize = 4 * impulse_.Count;
+          size += dataSize;
+          if (impulse_.Count!=0) size += 1 + pb::CodedOutputStream.ComputeInt32SizeNoTag(dataSize);
+          impulseMemoizedSerializedSize = dataSize;
+        }
+        if (HasOtherObjectReference) {
+          size += pb::CodedOutputStream.ComputeBytesSize(7, OtherObjectReference);
+        }
+        size += UnknownFields.SerializedSize;
+        memoizedSerializedSize = size;
+        return size;
+      }
+    }
+    
+    public static CollisionBegin ParseFrom(pb::ByteString data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static CollisionBegin ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static CollisionBegin ParseFrom(byte[] data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static CollisionBegin ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static CollisionBegin ParseFrom(global::System.IO.Stream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static CollisionBegin ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static CollisionBegin ParseDelimitedFrom(global::System.IO.Stream input) {
+      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+    }
+    public static CollisionBegin ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+    }
+    public static CollisionBegin ParseFrom(pb::CodedInputStream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static CollisionBegin ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Builder CreateBuilder() { return new Builder(); }
+    public override Builder ToBuilder() { return CreateBuilder(this); }
+    public override Builder CreateBuilderForType() { return new Builder(); }
+    public static Builder CreateBuilder(CollisionBegin prototype) {
+      return (Builder) new Builder().MergeFrom(prototype);
+    }
+    
+    public sealed partial class Builder : pb::GeneratedBuilder<CollisionBegin, Builder> {
+      protected override Builder ThisBuilder {
+        get { return this; }
+      }
+      public Builder() {}
+      
+      CollisionBegin result = new CollisionBegin();
+      
+      protected override CollisionBegin MessageBeingBuilt {
+        get { return result; }
+      }
+      
+      public override Builder Clear() {
+        result = new CollisionBegin();
+        return this;
+      }
+      
+      public override Builder Clone() {
+        return new Builder().MergeFrom(result);
+      }
+      
+      public override pbd::MessageDescriptor DescriptorForType {
+        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.Descriptor; }
+      }
+      
+      public override CollisionBegin DefaultInstanceForType {
+        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.DefaultInstance; }
+      }
+      
+      public override CollisionBegin BuildPartial() {
+        if (result == null) {
+          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+        }
+        result.thisPosition_.MakeReadOnly();
+        result.otherPosition_.MakeReadOnly();
+        result.thisNormal_.MakeReadOnly();
+        result.impulse_.MakeReadOnly();
+        CollisionBegin returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public override Builder MergeFrom(pb::IMessage other) {
+        if (other is CollisionBegin) {
+          return MergeFrom((CollisionBegin) other);
+        } else {
+          base.MergeFrom(other);
+          return this;
+        }
+      }
+      
+      public override Builder MergeFrom(CollisionBegin other) {
+        if (other == global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionBegin.DefaultInstance) return this;
+        if (other.HasTimestamp) {
+          Timestamp = other.Timestamp;
+        }
+        if (other.thisPosition_.Count != 0) {
+          base.AddRange(other.thisPosition_, result.thisPosition_);
+        }
+        if (other.otherPosition_.Count != 0) {
+          base.AddRange(other.otherPosition_, result.otherPosition_);
+        }
+        if (other.thisNormal_.Count != 0) {
+          base.AddRange(other.thisNormal_, result.thisNormal_);
+        }
+        if (other.impulse_.Count != 0) {
+          base.AddRange(other.impulse_, result.impulse_);
+        }
+        if (other.HasOtherObjectReference) {
+          OtherObjectReference = other.OtherObjectReference;
+        }
+        this.MergeUnknownFields(other.UnknownFields);
+        return this;
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input) {
+        return MergeFrom(input, pb::ExtensionRegistry.Empty);
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        pb::UnknownFieldSet.Builder unknownFields = null;
+        while (true) {
+          uint tag = input.ReadTag();
+          switch (tag) {
+            case 0: {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            default: {
+              if (pb::WireFormat.IsEndGroupTag(tag)) {
+                if (unknownFields != null) {
+                  this.UnknownFields = unknownFields.Build();
+                }
+                return this;
+              }
+              if (unknownFields == null) {
+                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+              }
+              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
+              break;
+            }
+            case 17: {
+              Timestamp = input.ReadFixed64();
+              break;
+            }
+            case 26: {
+              int length = input.ReadInt32();
+              int limit = input.PushLimit(length);
+              while (!input.ReachedLimit) {
+                AddThisPosition(input.ReadDouble());
+              }
+              input.PopLimit(limit);
+              break;
+            }
+            case 34: {
+              int length = input.ReadInt32();
+              int limit = input.PushLimit(length);
+              while (!input.ReachedLimit) {
+                AddOtherPosition(input.ReadDouble());
+              }
+              input.PopLimit(limit);
+              break;
+            }
+            case 42: {
+              int length = input.ReadInt32();
+              int limit = input.PushLimit(length);
+              while (!input.ReachedLimit) {
+                AddThisNormal(input.ReadFloat());
+              }
+              input.PopLimit(limit);
+              break;
+            }
+            case 50: {
+              int length = input.ReadInt32();
+              int limit = input.PushLimit(length);
+              while (!input.ReachedLimit) {
+                AddImpulse(input.ReadFloat());
+              }
+              input.PopLimit(limit);
+              break;
+            }
+            case 58: {
+              OtherObjectReference = input.ReadBytes();
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      public bool HasTimestamp {
+        get { return result.HasTimestamp; }
+      }
+      [global::System.CLSCompliant(false)]
+      public ulong Timestamp {
+        get { return result.Timestamp; }
+        set { SetTimestamp(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetTimestamp(ulong value) {
+        result.hasTimestamp = true;
+        result.timestamp_ = value;
+        return this;
+      }
+      public Builder ClearTimestamp() {
+        result.hasTimestamp = false;
+        result.timestamp_ = 0;
+        return this;
+      }
+      
+      public pbc::IPopsicleList<double> ThisPositionList {
+        get { return result.thisPosition_; }
+      }
+      public int ThisPositionCount {
+        get { return result.ThisPositionCount; }
+      }
+      public double GetThisPosition(int index) {
+        return result.GetThisPosition(index);
+      }
+      public Builder SetThisPosition(int index, double value) {
+        result.thisPosition_[index] = value;
+        return this;
+      }
+      public Builder AddThisPosition(double value) {
+        result.thisPosition_.Add(value);
+        return this;
+      }
+      public Builder AddRangeThisPosition(scg::IEnumerable<double> values) {
+        base.AddRange(values, result.thisPosition_);
+        return this;
+      }
+      public Builder ClearThisPosition() {
+        result.thisPosition_.Clear();
+        return this;
+      }
+      
+      public pbc::IPopsicleList<double> OtherPositionList {
+        get { return result.otherPosition_; }
+      }
+      public int OtherPositionCount {
+        get { return result.OtherPositionCount; }
+      }
+      public double GetOtherPosition(int index) {
+        return result.GetOtherPosition(index);
+      }
+      public Builder SetOtherPosition(int index, double value) {
+        result.otherPosition_[index] = value;
+        return this;
+      }
+      public Builder AddOtherPosition(double value) {
+        result.otherPosition_.Add(value);
+        return this;
+      }
+      public Builder AddRangeOtherPosition(scg::IEnumerable<double> values) {
+        base.AddRange(values, result.otherPosition_);
+        return this;
+      }
+      public Builder ClearOtherPosition() {
+        result.otherPosition_.Clear();
+        return this;
+      }
+      
+      public pbc::IPopsicleList<float> ThisNormalList {
+        get { return result.thisNormal_; }
+      }
+      public int ThisNormalCount {
+        get { return result.ThisNormalCount; }
+      }
+      public float GetThisNormal(int index) {
+        return result.GetThisNormal(index);
+      }
+      public Builder SetThisNormal(int index, float value) {
+        result.thisNormal_[index] = value;
+        return this;
+      }
+      public Builder AddThisNormal(float value) {
+        result.thisNormal_.Add(value);
+        return this;
+      }
+      public Builder AddRangeThisNormal(scg::IEnumerable<float> values) {
+        base.AddRange(values, result.thisNormal_);
+        return this;
+      }
+      public Builder ClearThisNormal() {
+        result.thisNormal_.Clear();
+        return this;
+      }
+      
+      public pbc::IPopsicleList<float> ImpulseList {
+        get { return result.impulse_; }
+      }
+      public int ImpulseCount {
+        get { return result.ImpulseCount; }
+      }
+      public float GetImpulse(int index) {
+        return result.GetImpulse(index);
+      }
+      public Builder SetImpulse(int index, float value) {
+        result.impulse_[index] = value;
+        return this;
+      }
+      public Builder AddImpulse(float value) {
+        result.impulse_.Add(value);
+        return this;
+      }
+      public Builder AddRangeImpulse(scg::IEnumerable<float> values) {
+        base.AddRange(values, result.impulse_);
+        return this;
+      }
+      public Builder ClearImpulse() {
+        result.impulse_.Clear();
+        return this;
+      }
+      
+      public bool HasOtherObjectReference {
+        get { return result.HasOtherObjectReference; }
+      }
+      public pb::ByteString OtherObjectReference {
+        get { return result.OtherObjectReference; }
+        set { SetOtherObjectReference(value); }
+      }
+      public Builder SetOtherObjectReference(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasOtherObjectReference = true;
+        result.otherObjectReference_ = value;
+        return this;
+      }
+      public Builder ClearOtherObjectReference() {
+        result.hasOtherObjectReference = false;
+        result.otherObjectReference_ = pb::ByteString.Empty;
+        return this;
+      }
+    }
+    static CollisionBegin() {
+      object.ReferenceEquals(global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.Descriptor, null);
+    }
+  }
+  
+  public sealed partial class CollisionEnd : pb::GeneratedMessage<CollisionEnd, CollisionEnd.Builder> {
+    private static readonly CollisionEnd defaultInstance = new Builder().BuildPartial();
+    public static CollisionEnd DefaultInstance {
+      get { return defaultInstance; }
+    }
+    
+    public override CollisionEnd DefaultInstanceForType {
+      get { return defaultInstance; }
+    }
+    
+    protected override CollisionEnd ThisMessage {
+      get { return this; }
+    }
+    
+    public static pbd::MessageDescriptor Descriptor {
+      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__Descriptor; }
+    }
+    
+    protected override pb::FieldAccess.FieldAccessorTable<CollisionEnd, CollisionEnd.Builder> InternalFieldAccessors {
+      get { return global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.internal__static_Sirikata_Physics_Protocol__PBJ_Internal_CollisionEnd__FieldAccessorTable; }
+    }
+    
+    public const int TimestampFieldNumber = 2;
+    private bool hasTimestamp;
+    private ulong timestamp_ = 0;
+    public bool HasTimestamp {
+      get { return hasTimestamp; }
+    }
+    [global::System.CLSCompliant(false)]
+    public ulong Timestamp {
+      get { return timestamp_; }
+    }
+    
+    public const int OtherObjectReferenceFieldNumber = 6;
+    private bool hasOtherObjectReference;
+    private pb::ByteString otherObjectReference_ = pb::ByteString.Empty;
+    public bool HasOtherObjectReference {
+      get { return hasOtherObjectReference; }
+    }
+    public pb::ByteString OtherObjectReference {
+      get { return otherObjectReference_; }
+    }
+    
+    public override bool IsInitialized {
+      get {
+        return true;
+      }
+    }
+    
+    public override void WriteTo(pb::CodedOutputStream output) {
+      if (HasTimestamp) {
+        output.WriteFixed64(2, Timestamp);
+      }
+      if (HasOtherObjectReference) {
+        output.WriteBytes(6, OtherObjectReference);
+      }
+      UnknownFields.WriteTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public override int SerializedSize {
+      get {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+        
+        size = 0;
+        if (HasTimestamp) {
+          size += pb::CodedOutputStream.ComputeFixed64Size(2, Timestamp);
+        }
+        if (HasOtherObjectReference) {
+          size += pb::CodedOutputStream.ComputeBytesSize(6, OtherObjectReference);
+        }
+        size += UnknownFields.SerializedSize;
+        memoizedSerializedSize = size;
+        return size;
+      }
+    }
+    
+    public static CollisionEnd ParseFrom(pb::ByteString data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static CollisionEnd ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static CollisionEnd ParseFrom(byte[] data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static CollisionEnd ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static CollisionEnd ParseFrom(global::System.IO.Stream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static CollisionEnd ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static CollisionEnd ParseDelimitedFrom(global::System.IO.Stream input) {
+      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+    }
+    public static CollisionEnd ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+    }
+    public static CollisionEnd ParseFrom(pb::CodedInputStream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static CollisionEnd ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Builder CreateBuilder() { return new Builder(); }
+    public override Builder ToBuilder() { return CreateBuilder(this); }
+    public override Builder CreateBuilderForType() { return new Builder(); }
+    public static Builder CreateBuilder(CollisionEnd prototype) {
+      return (Builder) new Builder().MergeFrom(prototype);
+    }
+    
+    public sealed partial class Builder : pb::GeneratedBuilder<CollisionEnd, Builder> {
+      protected override Builder ThisBuilder {
+        get { return this; }
+      }
+      public Builder() {}
+      
+      CollisionEnd result = new CollisionEnd();
+      
+      protected override CollisionEnd MessageBeingBuilt {
+        get { return result; }
+      }
+      
+      public override Builder Clear() {
+        result = new CollisionEnd();
+        return this;
+      }
+      
+      public override Builder Clone() {
+        return new Builder().MergeFrom(result);
+      }
+      
+      public override pbd::MessageDescriptor DescriptorForType {
+        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.Descriptor; }
+      }
+      
+      public override CollisionEnd DefaultInstanceForType {
+        get { return global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.DefaultInstance; }
+      }
+      
+      public override CollisionEnd BuildPartial() {
+        if (result == null) {
+          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+        }
+        CollisionEnd returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public override Builder MergeFrom(pb::IMessage other) {
+        if (other is CollisionEnd) {
+          return MergeFrom((CollisionEnd) other);
+        } else {
+          base.MergeFrom(other);
+          return this;
+        }
+      }
+      
+      public override Builder MergeFrom(CollisionEnd other) {
+        if (other == global::Sirikata.Physics.Protocol._PBJ_Internal.CollisionEnd.DefaultInstance) return this;
+        if (other.HasTimestamp) {
+          Timestamp = other.Timestamp;
+        }
+        if (other.HasOtherObjectReference) {
+          OtherObjectReference = other.OtherObjectReference;
+        }
+        this.MergeUnknownFields(other.UnknownFields);
+        return this;
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input) {
+        return MergeFrom(input, pb::ExtensionRegistry.Empty);
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        pb::UnknownFieldSet.Builder unknownFields = null;
+        while (true) {
+          uint tag = input.ReadTag();
+          switch (tag) {
+            case 0: {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            default: {
+              if (pb::WireFormat.IsEndGroupTag(tag)) {
+                if (unknownFields != null) {
+                  this.UnknownFields = unknownFields.Build();
+                }
+                return this;
+              }
+              if (unknownFields == null) {
+                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+              }
+              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
+              break;
+            }
+            case 17: {
+              Timestamp = input.ReadFixed64();
+              break;
+            }
+            case 50: {
+              OtherObjectReference = input.ReadBytes();
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      public bool HasTimestamp {
+        get { return result.HasTimestamp; }
+      }
+      [global::System.CLSCompliant(false)]
+      public ulong Timestamp {
+        get { return result.Timestamp; }
+        set { SetTimestamp(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetTimestamp(ulong value) {
+        result.hasTimestamp = true;
+        result.timestamp_ = value;
+        return this;
+      }
+      public Builder ClearTimestamp() {
+        result.hasTimestamp = false;
+        result.timestamp_ = 0;
+        return this;
+      }
+      
+      public bool HasOtherObjectReference {
+        get { return result.HasOtherObjectReference; }
+      }
+      public pb::ByteString OtherObjectReference {
+        get { return result.OtherObjectReference; }
+        set { SetOtherObjectReference(value); }
+      }
+      public Builder SetOtherObjectReference(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasOtherObjectReference = true;
+        result.otherObjectReference_ = value;
+        return this;
+      }
+      public Builder ClearOtherObjectReference() {
+        result.hasOtherObjectReference = false;
+        result.otherObjectReference_ = pb::ByteString.Empty;
+        return this;
+      }
+    }
+    static CollisionEnd() {
+      object.ReferenceEquals(global::Sirikata.Physics.Protocol._PBJ_Internal.Physics.Descriptor, null);
+    }
+  }
+  
+  #endregion
+  
+}

OpenSim/Client/Sirikata/Protocol/Physics.pbj.cs

@@ -0,0 +1,394 @@
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using pb = global::Google.ProtocolBuffers;
+namespace Sirikata.Physics.Protocol {
+    public class CollisionBegin : PBJ.IMessage {
+        protected _PBJ_Internal.CollisionBegin super;
+        public _PBJ_Internal.CollisionBegin _PBJSuper{ get { return super;} }
+        public CollisionBegin() {
+            super=new _PBJ_Internal.CollisionBegin();
+        }
+        public CollisionBegin(_PBJ_Internal.CollisionBegin reference) {
+            super=reference;
+        }
+        public static CollisionBegin defaultInstance= new CollisionBegin (_PBJ_Internal.CollisionBegin.DefaultInstance);
+        public static CollisionBegin DefaultInstance{
+            get {return defaultInstance;}
+        }
+        public static pbd.MessageDescriptor Descriptor {
+            get { return _PBJ_Internal.CollisionBegin.Descriptor; }        }
+        public static class Types {
+        }
+        public static bool WithinReservedFieldTagRange(int field_tag) {
+            return false;
+        }
+        public static bool WithinExtensionFieldTagRange(int field_tag) {
+            return false;
+        }
+        public const int TimestampFieldTag=2;
+        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
+        public PBJ.Time Timestamp{ get {
+            if (HasTimestamp) {
+                return PBJ._PBJ.CastTime(super.Timestamp);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        }
+        public const int ThisPositionFieldTag=3;
+        public int ThisPositionCount { get { return super.ThisPositionCount/3;} }
+        public bool HasThisPosition(int index) { return true; }
+        public PBJ.Vector3d GetThisPosition(int index) {
+            if (HasThisPosition(index)) {
+                return PBJ._PBJ.CastVector3d(super.GetThisPosition(index*3+0),super.GetThisPosition(index*3+1),super.GetThisPosition(index*3+2));
+            } else {
+                return PBJ._PBJ.CastVector3d();
+            }
+        }
+        public const int OtherPositionFieldTag=4;
+        public int OtherPositionCount { get { return super.OtherPositionCount/3;} }
+        public bool HasOtherPosition(int index) { return true; }
+        public PBJ.Vector3d GetOtherPosition(int index) {
+            if (HasOtherPosition(index)) {
+                return PBJ._PBJ.CastVector3d(super.GetOtherPosition(index*3+0),super.GetOtherPosition(index*3+1),super.GetOtherPosition(index*3+2));
+            } else {
+                return PBJ._PBJ.CastVector3d();
+            }
+        }
+        public const int ThisNormalFieldTag=5;
+        public int ThisNormalCount { get { return super.ThisNormalCount/2;} }
+        public bool HasThisNormal(int index) { return true; }
+        public PBJ.Vector3f GetThisNormal(int index) {
+            if (HasThisNormal(index)) {
+                return PBJ._PBJ.CastNormal(super.GetThisNormal(index*2+0),super.GetThisNormal(index*2+1));
+            } else {
+                return PBJ._PBJ.CastNormal();
+            }
+        }
+        public const int ImpulseFieldTag=6;
+        public int ImpulseCount { get { return super.ImpulseCount;} }
+        public bool HasImpulse(int index) {return PBJ._PBJ.ValidateFloat(super.GetImpulse(index));}
+        public float Impulse(int index) {
+            return (float)PBJ._PBJ.CastFloat(super.GetImpulse(index));
+        }
+        public const int OtherObjectReferenceFieldTag=7;
+        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
+        public PBJ.UUID OtherObjectReference{ get {
+            if (HasOtherObjectReference) {
+                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
+        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
+        public static Builder CreateBuilder() { return new Builder(); }
+        public static Builder CreateBuilder(CollisionBegin prototype) {
+            return (Builder)new Builder().MergeFrom(prototype);
+        }
+        public static CollisionBegin ParseFrom(pb::ByteString data) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
+        }
+        public static CollisionBegin ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
+        }
+        public static CollisionBegin ParseFrom(byte[] data) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
+        }
+        public static CollisionBegin ParseFrom(byte[] data, pb::ExtensionRegistry er) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
+        }
+        public static CollisionBegin ParseFrom(global::System.IO.Stream data) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
+        }
+        public static CollisionBegin ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
+        }
+        public static CollisionBegin ParseFrom(pb::CodedInputStream data) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data));
+        }
+        public static CollisionBegin ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
+            return new CollisionBegin(_PBJ_Internal.CollisionBegin.ParseFrom(data,er));
+        }
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+        public class Builder : global::PBJ.IMessage.IBuilder{
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+            protected _PBJ_Internal.CollisionBegin.Builder super;
+            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
+            public _PBJ_Internal.CollisionBegin.Builder _PBJSuper{ get { return super;} }
+            public Builder() {super = new _PBJ_Internal.CollisionBegin.Builder();}
+            public Builder(_PBJ_Internal.CollisionBegin.Builder other) {
+                super=other;
+            }
+            public Builder Clone() {return new Builder(super.Clone());}
+            public Builder MergeFrom(CollisionBegin prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
+            public Builder Clear() {super.Clear();return this;}
+            public CollisionBegin BuildPartial() {return new CollisionBegin(super.BuildPartial());}
+            public CollisionBegin Build() {if (_HasAllPBJFields) return new CollisionBegin(super.Build());return null;}
+            public pbd::MessageDescriptor DescriptorForType {
+                get { return CollisionBegin.Descriptor; }            }
+        public Builder ClearTimestamp() { super.ClearTimestamp();return this;}
+        public const int TimestampFieldTag=2;
+        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
+        public PBJ.Time Timestamp{ get {
+            if (HasTimestamp) {
+                return PBJ._PBJ.CastTime(super.Timestamp);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        set {
+            super.Timestamp=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearThisPosition() { super.ClearThisPosition();return this;}
+        public const int ThisPositionFieldTag=3;
+        public int ThisPositionCount { get { return super.ThisPositionCount/3;} }
+        public bool HasThisPosition(int index) { return true; }
+        public PBJ.Vector3d GetThisPosition(int index) {
+            if (HasThisPosition(index)) {
+                return PBJ._PBJ.CastVector3d(super.GetThisPosition(index*3+0),super.GetThisPosition(index*3+1),super.GetThisPosition(index*3+2));
+            } else {
+                return PBJ._PBJ.CastVector3d();
+            }
+        }
+        public Builder AddThisPosition(PBJ.Vector3d value) {
+            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
+            super.AddThisPosition(_PBJtempArray[0]);
+            super.AddThisPosition(_PBJtempArray[1]);
+            super.AddThisPosition(_PBJtempArray[2]);
+            return this;
+        }
+        public Builder SetThisPosition(int index,PBJ.Vector3d value) {
+            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
+            super.SetThisPosition(index*3+0,_PBJtempArray[0]);
+            super.SetThisPosition(index*3+1,_PBJtempArray[1]);
+            super.SetThisPosition(index*3+2,_PBJtempArray[2]);
+            return this;
+        }
+        public Builder ClearOtherPosition() { super.ClearOtherPosition();return this;}
+        public const int OtherPositionFieldTag=4;
+        public int OtherPositionCount { get { return super.OtherPositionCount/3;} }
+        public bool HasOtherPosition(int index) { return true; }
+        public PBJ.Vector3d GetOtherPosition(int index) {
+            if (HasOtherPosition(index)) {
+                return PBJ._PBJ.CastVector3d(super.GetOtherPosition(index*3+0),super.GetOtherPosition(index*3+1),super.GetOtherPosition(index*3+2));
+            } else {
+                return PBJ._PBJ.CastVector3d();
+            }
+        }
+        public Builder AddOtherPosition(PBJ.Vector3d value) {
+            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
+            super.AddOtherPosition(_PBJtempArray[0]);
+            super.AddOtherPosition(_PBJtempArray[1]);
+            super.AddOtherPosition(_PBJtempArray[2]);
+            return this;
+        }
+        public Builder SetOtherPosition(int index,PBJ.Vector3d value) {
+            double[] _PBJtempArray=PBJ._PBJ.ConstructVector3d(value);
+            super.SetOtherPosition(index*3+0,_PBJtempArray[0]);
+            super.SetOtherPosition(index*3+1,_PBJtempArray[1]);
+            super.SetOtherPosition(index*3+2,_PBJtempArray[2]);
+            return this;
+        }
+        public Builder ClearThisNormal() { super.ClearThisNormal();return this;}
+        public const int ThisNormalFieldTag=5;
+        public int ThisNormalCount { get { return super.ThisNormalCount/2;} }
+        public bool HasThisNormal(int index) { return true; }
+        public PBJ.Vector3f GetThisNormal(int index) {
+            if (HasThisNormal(index)) {
+                return PBJ._PBJ.CastNormal(super.GetThisNormal(index*2+0),super.GetThisNormal(index*2+1));
+            } else {
+                return PBJ._PBJ.CastNormal();
+            }
+        }
+        public Builder AddThisNormal(PBJ.Vector3f value) {
+            float[] _PBJtempArray=PBJ._PBJ.ConstructNormal(value);
+            super.AddThisNormal(_PBJtempArray[0]);
+            super.AddThisNormal(_PBJtempArray[1]);
+            return this;
+        }
+        public Builder SetThisNormal(int index,PBJ.Vector3f value) {
+            float[] _PBJtempArray=PBJ._PBJ.ConstructNormal(value);
+            super.SetThisNormal(index*2+0,_PBJtempArray[0]);
+            super.SetThisNormal(index*2+1,_PBJtempArray[1]);
+            return this;
+        }
+        public Builder ClearImpulse() { super.ClearImpulse();return this;}
+        public Builder SetImpulse(int index, float value) {
+            super.SetImpulse(index,PBJ._PBJ.Construct(value));
+            return this;
+        }
+        public const int ImpulseFieldTag=6;
+        public int ImpulseCount { get { return super.ImpulseCount;} }
+        public bool HasImpulse(int index) {return PBJ._PBJ.ValidateFloat(super.GetImpulse(index));}
+        public float Impulse(int index) {
+            return (float)PBJ._PBJ.CastFloat(super.GetImpulse(index));
+        }
+        public Builder AddImpulse(float value) {
+            super.AddImpulse(PBJ._PBJ.Construct(value));
+            return this;
+        }
+        public Builder ClearOtherObjectReference() { super.ClearOtherObjectReference();return this;}
+        public const int OtherObjectReferenceFieldTag=7;
+        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
+        public PBJ.UUID OtherObjectReference{ get {
+            if (HasOtherObjectReference) {
+                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.OtherObjectReference=(PBJ._PBJ.Construct(value));
+        }
+        }
+        }
+    }
+}
+namespace Sirikata.Physics.Protocol {
+    public class CollisionEnd : PBJ.IMessage {
+        protected _PBJ_Internal.CollisionEnd super;
+        public _PBJ_Internal.CollisionEnd _PBJSuper{ get { return super;} }
+        public CollisionEnd() {
+            super=new _PBJ_Internal.CollisionEnd();
+        }
+        public CollisionEnd(_PBJ_Internal.CollisionEnd reference) {
+            super=reference;
+        }
+        public static CollisionEnd defaultInstance= new CollisionEnd (_PBJ_Internal.CollisionEnd.DefaultInstance);
+        public static CollisionEnd DefaultInstance{
+            get {return defaultInstance;}
+        }
+        public static pbd.MessageDescriptor Descriptor {
+            get { return _PBJ_Internal.CollisionEnd.Descriptor; }        }
+        public static class Types {
+        }
+        public static bool WithinReservedFieldTagRange(int field_tag) {
+            return false;
+        }
+        public static bool WithinExtensionFieldTagRange(int field_tag) {
+            return false;
+        }
+        public const int TimestampFieldTag=2;
+        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
+        public PBJ.Time Timestamp{ get {
+            if (HasTimestamp) {
+                return PBJ._PBJ.CastTime(super.Timestamp);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        }
+        public const int OtherObjectReferenceFieldTag=6;
+        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
+        public PBJ.UUID OtherObjectReference{ get {
+            if (HasOtherObjectReference) {
+                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
+        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
+        public static Builder CreateBuilder() { return new Builder(); }
+        public static Builder CreateBuilder(CollisionEnd prototype) {
+            return (Builder)new Builder().MergeFrom(prototype);
+        }
+        public static CollisionEnd ParseFrom(pb::ByteString data) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
+        }
+        public static CollisionEnd ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
+        }
+        public static CollisionEnd ParseFrom(byte[] data) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
+        }
+        public static CollisionEnd ParseFrom(byte[] data, pb::ExtensionRegistry er) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
+        }
+        public static CollisionEnd ParseFrom(global::System.IO.Stream data) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
+        }
+        public static CollisionEnd ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
+        }
+        public static CollisionEnd ParseFrom(pb::CodedInputStream data) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data));
+        }
+        public static CollisionEnd ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
+            return new CollisionEnd(_PBJ_Internal.CollisionEnd.ParseFrom(data,er));
+        }
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+        public class Builder : global::PBJ.IMessage.IBuilder{
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+            protected _PBJ_Internal.CollisionEnd.Builder super;
+            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
+            public _PBJ_Internal.CollisionEnd.Builder _PBJSuper{ get { return super;} }
+            public Builder() {super = new _PBJ_Internal.CollisionEnd.Builder();}
+            public Builder(_PBJ_Internal.CollisionEnd.Builder other) {
+                super=other;
+            }
+            public Builder Clone() {return new Builder(super.Clone());}
+            public Builder MergeFrom(CollisionEnd prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
+            public Builder Clear() {super.Clear();return this;}
+            public CollisionEnd BuildPartial() {return new CollisionEnd(super.BuildPartial());}
+            public CollisionEnd Build() {if (_HasAllPBJFields) return new CollisionEnd(super.Build());return null;}
+            public pbd::MessageDescriptor DescriptorForType {
+                get { return CollisionEnd.Descriptor; }            }
+        public Builder ClearTimestamp() { super.ClearTimestamp();return this;}
+        public const int TimestampFieldTag=2;
+        public bool HasTimestamp{ get {return super.HasTimestamp&&PBJ._PBJ.ValidateTime(super.Timestamp);} }
+        public PBJ.Time Timestamp{ get {
+            if (HasTimestamp) {
+                return PBJ._PBJ.CastTime(super.Timestamp);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        set {
+            super.Timestamp=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearOtherObjectReference() { super.ClearOtherObjectReference();return this;}
+        public const int OtherObjectReferenceFieldTag=6;
+        public bool HasOtherObjectReference{ get {return super.HasOtherObjectReference&&PBJ._PBJ.ValidateUuid(super.OtherObjectReference);} }
+        public PBJ.UUID OtherObjectReference{ get {
+            if (HasOtherObjectReference) {
+                return PBJ._PBJ.CastUuid(super.OtherObjectReference);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.OtherObjectReference=(PBJ._PBJ.Construct(value));
+        }
+        }
+        }
+    }
+}

OpenSim/Client/Sirikata/Protocol/Subscription.cs

@@ -0,0 +1,856 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+
+using pb = global::Google.ProtocolBuffers;
+using pbc = global::Google.ProtocolBuffers.Collections;
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using scg = global::System.Collections.Generic;
+namespace Sirikata.Subscription.Protocol._PBJ_Internal {
+  
+  public static partial class Subscription {
+  
+    #region Extension registration
+    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
+    }
+    #endregion
+    #region Static variables
+    internal static pbd::MessageDescriptor internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Address, global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder> internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__FieldAccessorTable;
+    internal static pbd::MessageDescriptor internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe, global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.Builder> internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__FieldAccessorTable;
+    internal static pbd::MessageDescriptor internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast, global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.Builder> internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__FieldAccessorTable;
+    #endregion
+    #region Descriptor
+    public static pbd::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbd::FileDescriptor descriptor;
+    
+    static Subscription() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          "ChJTdWJzY3JpcHRpb24ucHJvdG8SLFNpcmlrYXRhLlN1YnNjcmlwdGlvbi5Q" + 
+          "cm90b2NvbC5fUEJKX0ludGVybmFsIiwKB0FkZHJlc3MSEAoIaG9zdG5hbWUY" + 
+          "ASABKAkSDwoHc2VydmljZRgCIAEoCSKMAQoJU3Vic2NyaWJlElAKEWJyb2Fk" + 
+          "Y2FzdF9hZGRyZXNzGAcgASgLMjUuU2lyaWthdGEuU3Vic2NyaXB0aW9uLlBy" + 
+          "b3RvY29sLl9QQkpfSW50ZXJuYWwuQWRkcmVzcxIWCg5icm9hZGNhc3RfbmFt" + 
+          "ZRgIIAEoDBIVCg11cGRhdGVfcGVyaW9kGAkgASgQIiMKCUJyb2FkY2FzdBIW" + 
+          "Cg5icm9hZGNhc3RfbmFtZRgHIAEoDA==");
+      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
+        descriptor = root;
+        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor = Descriptor.MessageTypes[0];
+        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__FieldAccessorTable = 
+            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Address, global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder>(internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor,
+                new string[] { "Hostname", "Service", });
+        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor = Descriptor.MessageTypes[1];
+        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__FieldAccessorTable = 
+            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe, global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.Builder>(internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor,
+                new string[] { "BroadcastAddress", "BroadcastName", "UpdatePeriod", });
+        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor = Descriptor.MessageTypes[2];
+        internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__FieldAccessorTable = 
+            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast, global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.Builder>(internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor,
+                new string[] { "BroadcastName", });
+        return null;
+      };
+      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
+          new pbd::FileDescriptor[] {
+          }, assigner);
+    }
+    #endregion
+    
+  }
+  #region Messages
+  public sealed partial class Address : pb::GeneratedMessage<Address, Address.Builder> {
+    private static readonly Address defaultInstance = new Builder().BuildPartial();
+    public static Address DefaultInstance {
+      get { return defaultInstance; }
+    }
+    
+    public override Address DefaultInstanceForType {
+      get { return defaultInstance; }
+    }
+    
+    protected override Address ThisMessage {
+      get { return this; }
+    }
+    
+    public static pbd::MessageDescriptor Descriptor {
+      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__Descriptor; }
+    }
+    
+    protected override pb::FieldAccess.FieldAccessorTable<Address, Address.Builder> InternalFieldAccessors {
+      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Address__FieldAccessorTable; }
+    }
+    
+    public const int HostnameFieldNumber = 1;
+    private bool hasHostname;
+    private string hostname_ = "";
+    public bool HasHostname {
+      get { return hasHostname; }
+    }
+    public string Hostname {
+      get { return hostname_; }
+    }
+    
+    public const int ServiceFieldNumber = 2;
+    private bool hasService;
+    private string service_ = "";
+    public bool HasService {
+      get { return hasService; }
+    }
+    public string Service {
+      get { return service_; }
+    }
+    
+    public override bool IsInitialized {
+      get {
+        return true;
+      }
+    }
+    
+    public override void WriteTo(pb::CodedOutputStream output) {
+      if (HasHostname) {
+        output.WriteString(1, Hostname);
+      }
+      if (HasService) {
+        output.WriteString(2, Service);
+      }
+      UnknownFields.WriteTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public override int SerializedSize {
+      get {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+        
+        size = 0;
+        if (HasHostname) {
+          size += pb::CodedOutputStream.ComputeStringSize(1, Hostname);
+        }
+        if (HasService) {
+          size += pb::CodedOutputStream.ComputeStringSize(2, Service);
+        }
+        size += UnknownFields.SerializedSize;
+        memoizedSerializedSize = size;
+        return size;
+      }
+    }
+    
+    public static Address ParseFrom(pb::ByteString data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Address ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Address ParseFrom(byte[] data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Address ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Address ParseFrom(global::System.IO.Stream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Address ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Address ParseDelimitedFrom(global::System.IO.Stream input) {
+      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+    }
+    public static Address ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+    }
+    public static Address ParseFrom(pb::CodedInputStream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Address ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Builder CreateBuilder() { return new Builder(); }
+    public override Builder ToBuilder() { return CreateBuilder(this); }
+    public override Builder CreateBuilderForType() { return new Builder(); }
+    public static Builder CreateBuilder(Address prototype) {
+      return (Builder) new Builder().MergeFrom(prototype);
+    }
+    
+    public sealed partial class Builder : pb::GeneratedBuilder<Address, Builder> {
+      protected override Builder ThisBuilder {
+        get { return this; }
+      }
+      public Builder() {}
+      
+      Address result = new Address();
+      
+      protected override Address MessageBeingBuilt {
+        get { return result; }
+      }
+      
+      public override Builder Clear() {
+        result = new Address();
+        return this;
+      }
+      
+      public override Builder Clone() {
+        return new Builder().MergeFrom(result);
+      }
+      
+      public override pbd::MessageDescriptor DescriptorForType {
+        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Descriptor; }
+      }
+      
+      public override Address DefaultInstanceForType {
+        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance; }
+      }
+      
+      public override Address BuildPartial() {
+        if (result == null) {
+          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+        }
+        Address returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public override Builder MergeFrom(pb::IMessage other) {
+        if (other is Address) {
+          return MergeFrom((Address) other);
+        } else {
+          base.MergeFrom(other);
+          return this;
+        }
+      }
+      
+      public override Builder MergeFrom(Address other) {
+        if (other == global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance) return this;
+        if (other.HasHostname) {
+          Hostname = other.Hostname;
+        }
+        if (other.HasService) {
+          Service = other.Service;
+        }
+        this.MergeUnknownFields(other.UnknownFields);
+        return this;
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input) {
+        return MergeFrom(input, pb::ExtensionRegistry.Empty);
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        pb::UnknownFieldSet.Builder unknownFields = null;
+        while (true) {
+          uint tag = input.ReadTag();
+          switch (tag) {
+            case 0: {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            default: {
+              if (pb::WireFormat.IsEndGroupTag(tag)) {
+                if (unknownFields != null) {
+                  this.UnknownFields = unknownFields.Build();
+                }
+                return this;
+              }
+              if (unknownFields == null) {
+                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+              }
+              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
+              break;
+            }
+            case 10: {
+              Hostname = input.ReadString();
+              break;
+            }
+            case 18: {
+              Service = input.ReadString();
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      public bool HasHostname {
+        get { return result.HasHostname; }
+      }
+      public string Hostname {
+        get { return result.Hostname; }
+        set { SetHostname(value); }
+      }
+      public Builder SetHostname(string value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasHostname = true;
+        result.hostname_ = value;
+        return this;
+      }
+      public Builder ClearHostname() {
+        result.hasHostname = false;
+        result.hostname_ = "";
+        return this;
+      }
+      
+      public bool HasService {
+        get { return result.HasService; }
+      }
+      public string Service {
+        get { return result.Service; }
+        set { SetService(value); }
+      }
+      public Builder SetService(string value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasService = true;
+        result.service_ = value;
+        return this;
+      }
+      public Builder ClearService() {
+        result.hasService = false;
+        result.service_ = "";
+        return this;
+      }
+    }
+    static Address() {
+      object.ReferenceEquals(global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.Descriptor, null);
+    }
+  }
+  
+  public sealed partial class Subscribe : pb::GeneratedMessage<Subscribe, Subscribe.Builder> {
+    private static readonly Subscribe defaultInstance = new Builder().BuildPartial();
+    public static Subscribe DefaultInstance {
+      get { return defaultInstance; }
+    }
+    
+    public override Subscribe DefaultInstanceForType {
+      get { return defaultInstance; }
+    }
+    
+    protected override Subscribe ThisMessage {
+      get { return this; }
+    }
+    
+    public static pbd::MessageDescriptor Descriptor {
+      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__Descriptor; }
+    }
+    
+    protected override pb::FieldAccess.FieldAccessorTable<Subscribe, Subscribe.Builder> InternalFieldAccessors {
+      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Subscribe__FieldAccessorTable; }
+    }
+    
+    public const int BroadcastAddressFieldNumber = 7;
+    private bool hasBroadcastAddress;
+    private global::Sirikata.Subscription.Protocol._PBJ_Internal.Address broadcastAddress_ = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance;
+    public bool HasBroadcastAddress {
+      get { return hasBroadcastAddress; }
+    }
+    public global::Sirikata.Subscription.Protocol._PBJ_Internal.Address BroadcastAddress {
+      get { return broadcastAddress_; }
+    }
+    
+    public const int BroadcastNameFieldNumber = 8;
+    private bool hasBroadcastName;
+    private pb::ByteString broadcastName_ = pb::ByteString.Empty;
+    public bool HasBroadcastName {
+      get { return hasBroadcastName; }
+    }
+    public pb::ByteString BroadcastName {
+      get { return broadcastName_; }
+    }
+    
+    public const int UpdatePeriodFieldNumber = 9;
+    private bool hasUpdatePeriod;
+    private long updatePeriod_ = 0;
+    public bool HasUpdatePeriod {
+      get { return hasUpdatePeriod; }
+    }
+    public long UpdatePeriod {
+      get { return updatePeriod_; }
+    }
+    
+    public override bool IsInitialized {
+      get {
+        return true;
+      }
+    }
+    
+    public override void WriteTo(pb::CodedOutputStream output) {
+      if (HasBroadcastAddress) {
+        output.WriteMessage(7, BroadcastAddress);
+      }
+      if (HasBroadcastName) {
+        output.WriteBytes(8, BroadcastName);
+      }
+      if (HasUpdatePeriod) {
+        output.WriteSFixed64(9, UpdatePeriod);
+      }
+      UnknownFields.WriteTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public override int SerializedSize {
+      get {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+        
+        size = 0;
+        if (HasBroadcastAddress) {
+          size += pb::CodedOutputStream.ComputeMessageSize(7, BroadcastAddress);
+        }
+        if (HasBroadcastName) {
+          size += pb::CodedOutputStream.ComputeBytesSize(8, BroadcastName);
+        }
+        if (HasUpdatePeriod) {
+          size += pb::CodedOutputStream.ComputeSFixed64Size(9, UpdatePeriod);
+        }
+        size += UnknownFields.SerializedSize;
+        memoizedSerializedSize = size;
+        return size;
+      }
+    }
+    
+    public static Subscribe ParseFrom(pb::ByteString data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Subscribe ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Subscribe ParseFrom(byte[] data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Subscribe ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Subscribe ParseFrom(global::System.IO.Stream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Subscribe ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Subscribe ParseDelimitedFrom(global::System.IO.Stream input) {
+      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+    }
+    public static Subscribe ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+    }
+    public static Subscribe ParseFrom(pb::CodedInputStream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Subscribe ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Builder CreateBuilder() { return new Builder(); }
+    public override Builder ToBuilder() { return CreateBuilder(this); }
+    public override Builder CreateBuilderForType() { return new Builder(); }
+    public static Builder CreateBuilder(Subscribe prototype) {
+      return (Builder) new Builder().MergeFrom(prototype);
+    }
+    
+    public sealed partial class Builder : pb::GeneratedBuilder<Subscribe, Builder> {
+      protected override Builder ThisBuilder {
+        get { return this; }
+      }
+      public Builder() {}
+      
+      Subscribe result = new Subscribe();
+      
+      protected override Subscribe MessageBeingBuilt {
+        get { return result; }
+      }
+      
+      public override Builder Clear() {
+        result = new Subscribe();
+        return this;
+      }
+      
+      public override Builder Clone() {
+        return new Builder().MergeFrom(result);
+      }
+      
+      public override pbd::MessageDescriptor DescriptorForType {
+        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.Descriptor; }
+      }
+      
+      public override Subscribe DefaultInstanceForType {
+        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.DefaultInstance; }
+      }
+      
+      public override Subscribe BuildPartial() {
+        if (result == null) {
+          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+        }
+        Subscribe returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public override Builder MergeFrom(pb::IMessage other) {
+        if (other is Subscribe) {
+          return MergeFrom((Subscribe) other);
+        } else {
+          base.MergeFrom(other);
+          return this;
+        }
+      }
+      
+      public override Builder MergeFrom(Subscribe other) {
+        if (other == global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscribe.DefaultInstance) return this;
+        if (other.HasBroadcastAddress) {
+          MergeBroadcastAddress(other.BroadcastAddress);
+        }
+        if (other.HasBroadcastName) {
+          BroadcastName = other.BroadcastName;
+        }
+        if (other.HasUpdatePeriod) {
+          UpdatePeriod = other.UpdatePeriod;
+        }
+        this.MergeUnknownFields(other.UnknownFields);
+        return this;
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input) {
+        return MergeFrom(input, pb::ExtensionRegistry.Empty);
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        pb::UnknownFieldSet.Builder unknownFields = null;
+        while (true) {
+          uint tag = input.ReadTag();
+          switch (tag) {
+            case 0: {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            default: {
+              if (pb::WireFormat.IsEndGroupTag(tag)) {
+                if (unknownFields != null) {
+                  this.UnknownFields = unknownFields.Build();
+                }
+                return this;
+              }
+              if (unknownFields == null) {
+                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+              }
+              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
+              break;
+            }
+            case 58: {
+              global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder subBuilder = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.CreateBuilder();
+              if (HasBroadcastAddress) {
+                subBuilder.MergeFrom(BroadcastAddress);
+              }
+              input.ReadMessage(subBuilder, extensionRegistry);
+              BroadcastAddress = subBuilder.BuildPartial();
+              break;
+            }
+            case 66: {
+              BroadcastName = input.ReadBytes();
+              break;
+            }
+            case 73: {
+              UpdatePeriod = input.ReadSFixed64();
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      public bool HasBroadcastAddress {
+       get { return result.HasBroadcastAddress; }
+      }
+      public global::Sirikata.Subscription.Protocol._PBJ_Internal.Address BroadcastAddress {
+        get { return result.BroadcastAddress; }
+        set { SetBroadcastAddress(value); }
+      }
+      public Builder SetBroadcastAddress(global::Sirikata.Subscription.Protocol._PBJ_Internal.Address value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasBroadcastAddress = true;
+        result.broadcastAddress_ = value;
+        return this;
+      }
+      public Builder SetBroadcastAddress(global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.Builder builderForValue) {
+        pb::ThrowHelper.ThrowIfNull(builderForValue, "builderForValue");
+        result.hasBroadcastAddress = true;
+        result.broadcastAddress_ = builderForValue.Build();
+        return this;
+      }
+      public Builder MergeBroadcastAddress(global::Sirikata.Subscription.Protocol._PBJ_Internal.Address value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        if (result.HasBroadcastAddress &&
+            result.broadcastAddress_ != global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance) {
+            result.broadcastAddress_ = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.CreateBuilder(result.broadcastAddress_).MergeFrom(value).BuildPartial();
+        } else {
+          result.broadcastAddress_ = value;
+        }
+        result.hasBroadcastAddress = true;
+        return this;
+      }
+      public Builder ClearBroadcastAddress() {
+        result.hasBroadcastAddress = false;
+        result.broadcastAddress_ = global::Sirikata.Subscription.Protocol._PBJ_Internal.Address.DefaultInstance;
+        return this;
+      }
+      
+      public bool HasBroadcastName {
+        get { return result.HasBroadcastName; }
+      }
+      public pb::ByteString BroadcastName {
+        get { return result.BroadcastName; }
+        set { SetBroadcastName(value); }
+      }
+      public Builder SetBroadcastName(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasBroadcastName = true;
+        result.broadcastName_ = value;
+        return this;
+      }
+      public Builder ClearBroadcastName() {
+        result.hasBroadcastName = false;
+        result.broadcastName_ = pb::ByteString.Empty;
+        return this;
+      }
+      
+      public bool HasUpdatePeriod {
+        get { return result.HasUpdatePeriod; }
+      }
+      public long UpdatePeriod {
+        get { return result.UpdatePeriod; }
+        set { SetUpdatePeriod(value); }
+      }
+      public Builder SetUpdatePeriod(long value) {
+        result.hasUpdatePeriod = true;
+        result.updatePeriod_ = value;
+        return this;
+      }
+      public Builder ClearUpdatePeriod() {
+        result.hasUpdatePeriod = false;
+        result.updatePeriod_ = 0;
+        return this;
+      }
+    }
+    static Subscribe() {
+      object.ReferenceEquals(global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.Descriptor, null);
+    }
+  }
+  
+  public sealed partial class Broadcast : pb::GeneratedMessage<Broadcast, Broadcast.Builder> {
+    private static readonly Broadcast defaultInstance = new Builder().BuildPartial();
+    public static Broadcast DefaultInstance {
+      get { return defaultInstance; }
+    }
+    
+    public override Broadcast DefaultInstanceForType {
+      get { return defaultInstance; }
+    }
+    
+    protected override Broadcast ThisMessage {
+      get { return this; }
+    }
+    
+    public static pbd::MessageDescriptor Descriptor {
+      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__Descriptor; }
+    }
+    
+    protected override pb::FieldAccess.FieldAccessorTable<Broadcast, Broadcast.Builder> InternalFieldAccessors {
+      get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.internal__static_Sirikata_Subscription_Protocol__PBJ_Internal_Broadcast__FieldAccessorTable; }
+    }
+    
+    public const int BroadcastNameFieldNumber = 7;
+    private bool hasBroadcastName;
+    private pb::ByteString broadcastName_ = pb::ByteString.Empty;
+    public bool HasBroadcastName {
+      get { return hasBroadcastName; }
+    }
+    public pb::ByteString BroadcastName {
+      get { return broadcastName_; }
+    }
+    
+    public override bool IsInitialized {
+      get {
+        return true;
+      }
+    }
+    
+    public override void WriteTo(pb::CodedOutputStream output) {
+      if (HasBroadcastName) {
+        output.WriteBytes(7, BroadcastName);
+      }
+      UnknownFields.WriteTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public override int SerializedSize {
+      get {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+        
+        size = 0;
+        if (HasBroadcastName) {
+          size += pb::CodedOutputStream.ComputeBytesSize(7, BroadcastName);
+        }
+        size += UnknownFields.SerializedSize;
+        memoizedSerializedSize = size;
+        return size;
+      }
+    }
+    
+    public static Broadcast ParseFrom(pb::ByteString data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Broadcast ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Broadcast ParseFrom(byte[] data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static Broadcast ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static Broadcast ParseFrom(global::System.IO.Stream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Broadcast ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Broadcast ParseDelimitedFrom(global::System.IO.Stream input) {
+      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+    }
+    public static Broadcast ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+    }
+    public static Broadcast ParseFrom(pb::CodedInputStream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static Broadcast ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Builder CreateBuilder() { return new Builder(); }
+    public override Builder ToBuilder() { return CreateBuilder(this); }
+    public override Builder CreateBuilderForType() { return new Builder(); }
+    public static Builder CreateBuilder(Broadcast prototype) {
+      return (Builder) new Builder().MergeFrom(prototype);
+    }
+    
+    public sealed partial class Builder : pb::GeneratedBuilder<Broadcast, Builder> {
+      protected override Builder ThisBuilder {
+        get { return this; }
+      }
+      public Builder() {}
+      
+      Broadcast result = new Broadcast();
+      
+      protected override Broadcast MessageBeingBuilt {
+        get { return result; }
+      }
+      
+      public override Builder Clear() {
+        result = new Broadcast();
+        return this;
+      }
+      
+      public override Builder Clone() {
+        return new Builder().MergeFrom(result);
+      }
+      
+      public override pbd::MessageDescriptor DescriptorForType {
+        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.Descriptor; }
+      }
+      
+      public override Broadcast DefaultInstanceForType {
+        get { return global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.DefaultInstance; }
+      }
+      
+      public override Broadcast BuildPartial() {
+        if (result == null) {
+          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+        }
+        Broadcast returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public override Builder MergeFrom(pb::IMessage other) {
+        if (other is Broadcast) {
+          return MergeFrom((Broadcast) other);
+        } else {
+          base.MergeFrom(other);
+          return this;
+        }
+      }
+      
+      public override Builder MergeFrom(Broadcast other) {
+        if (other == global::Sirikata.Subscription.Protocol._PBJ_Internal.Broadcast.DefaultInstance) return this;
+        if (other.HasBroadcastName) {
+          BroadcastName = other.BroadcastName;
+        }
+        this.MergeUnknownFields(other.UnknownFields);
+        return this;
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input) {
+        return MergeFrom(input, pb::ExtensionRegistry.Empty);
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        pb::UnknownFieldSet.Builder unknownFields = null;
+        while (true) {
+          uint tag = input.ReadTag();
+          switch (tag) {
+            case 0: {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            default: {
+              if (pb::WireFormat.IsEndGroupTag(tag)) {
+                if (unknownFields != null) {
+                  this.UnknownFields = unknownFields.Build();
+                }
+                return this;
+              }
+              if (unknownFields == null) {
+                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+              }
+              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
+              break;
+            }
+            case 58: {
+              BroadcastName = input.ReadBytes();
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      public bool HasBroadcastName {
+        get { return result.HasBroadcastName; }
+      }
+      public pb::ByteString BroadcastName {
+        get { return result.BroadcastName; }
+        set { SetBroadcastName(value); }
+      }
+      public Builder SetBroadcastName(pb::ByteString value) {
+        pb::ThrowHelper.ThrowIfNull(value, "value");
+        result.hasBroadcastName = true;
+        result.broadcastName_ = value;
+        return this;
+      }
+      public Builder ClearBroadcastName() {
+        result.hasBroadcastName = false;
+        result.broadcastName_ = pb::ByteString.Empty;
+        return this;
+      }
+    }
+    static Broadcast() {
+      object.ReferenceEquals(global::Sirikata.Subscription.Protocol._PBJ_Internal.Subscription.Descriptor, null);
+    }
+  }
+  
+  #endregion
+  
+}

OpenSim/Client/Sirikata/Protocol/Subscription.pbj.cs

@@ -0,0 +1,404 @@
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using pb = global::Google.ProtocolBuffers;
+namespace Sirikata.Subscription.Protocol {
+    public class Address : PBJ.IMessage {
+        protected _PBJ_Internal.Address super;
+        public _PBJ_Internal.Address _PBJSuper{ get { return super;} }
+        public Address() {
+            super=new _PBJ_Internal.Address();
+        }
+        public Address(_PBJ_Internal.Address reference) {
+            super=reference;
+        }
+        public static Address defaultInstance= new Address (_PBJ_Internal.Address.DefaultInstance);
+        public static Address DefaultInstance{
+            get {return defaultInstance;}
+        }
+        public static pbd.MessageDescriptor Descriptor {
+            get { return _PBJ_Internal.Address.Descriptor; }        }
+        public static class Types {
+        }
+        public static bool WithinReservedFieldTagRange(int field_tag) {
+            return false;
+        }
+        public static bool WithinExtensionFieldTagRange(int field_tag) {
+            return false;
+        }
+        public const int HostnameFieldTag=1;
+        public bool HasHostname{ get {return super.HasHostname&&PBJ._PBJ.ValidateString(super.Hostname);} }
+        public string Hostname{ get {
+            if (HasHostname) {
+                return PBJ._PBJ.CastString(super.Hostname);
+            } else {
+                return PBJ._PBJ.CastString();
+            }
+        }
+        }
+        public const int ServiceFieldTag=2;
+        public bool HasService{ get {return super.HasService&&PBJ._PBJ.ValidateString(super.Service);} }
+        public string Service{ get {
+            if (HasService) {
+                return PBJ._PBJ.CastString(super.Service);
+            } else {
+                return PBJ._PBJ.CastString();
+            }
+        }
+        }
+            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
+        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
+        public static Builder CreateBuilder() { return new Builder(); }
+        public static Builder CreateBuilder(Address prototype) {
+            return (Builder)new Builder().MergeFrom(prototype);
+        }
+        public static Address ParseFrom(pb::ByteString data) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data));
+        }
+        public static Address ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
+        }
+        public static Address ParseFrom(byte[] data) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data));
+        }
+        public static Address ParseFrom(byte[] data, pb::ExtensionRegistry er) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
+        }
+        public static Address ParseFrom(global::System.IO.Stream data) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data));
+        }
+        public static Address ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
+        }
+        public static Address ParseFrom(pb::CodedInputStream data) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data));
+        }
+        public static Address ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
+            return new Address(_PBJ_Internal.Address.ParseFrom(data,er));
+        }
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+        public class Builder : global::PBJ.IMessage.IBuilder{
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+            protected _PBJ_Internal.Address.Builder super;
+            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
+            public _PBJ_Internal.Address.Builder _PBJSuper{ get { return super;} }
+            public Builder() {super = new _PBJ_Internal.Address.Builder();}
+            public Builder(_PBJ_Internal.Address.Builder other) {
+                super=other;
+            }
+            public Builder Clone() {return new Builder(super.Clone());}
+            public Builder MergeFrom(Address prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
+            public Builder Clear() {super.Clear();return this;}
+            public Address BuildPartial() {return new Address(super.BuildPartial());}
+            public Address Build() {if (_HasAllPBJFields) return new Address(super.Build());return null;}
+            public pbd::MessageDescriptor DescriptorForType {
+                get { return Address.Descriptor; }            }
+        public Builder ClearHostname() { super.ClearHostname();return this;}
+        public const int HostnameFieldTag=1;
+        public bool HasHostname{ get {return super.HasHostname&&PBJ._PBJ.ValidateString(super.Hostname);} }
+        public string Hostname{ get {
+            if (HasHostname) {
+                return PBJ._PBJ.CastString(super.Hostname);
+            } else {
+                return PBJ._PBJ.CastString();
+            }
+        }
+        set {
+            super.Hostname=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearService() { super.ClearService();return this;}
+        public const int ServiceFieldTag=2;
+        public bool HasService{ get {return super.HasService&&PBJ._PBJ.ValidateString(super.Service);} }
+        public string Service{ get {
+            if (HasService) {
+                return PBJ._PBJ.CastString(super.Service);
+            } else {
+                return PBJ._PBJ.CastString();
+            }
+        }
+        set {
+            super.Service=(PBJ._PBJ.Construct(value));
+        }
+        }
+        }
+    }
+}
+namespace Sirikata.Subscription.Protocol {
+    public class Subscribe : PBJ.IMessage {
+        protected _PBJ_Internal.Subscribe super;
+        public _PBJ_Internal.Subscribe _PBJSuper{ get { return super;} }
+        public Subscribe() {
+            super=new _PBJ_Internal.Subscribe();
+        }
+        public Subscribe(_PBJ_Internal.Subscribe reference) {
+            super=reference;
+        }
+        public static Subscribe defaultInstance= new Subscribe (_PBJ_Internal.Subscribe.DefaultInstance);
+        public static Subscribe DefaultInstance{
+            get {return defaultInstance;}
+        }
+        public static pbd.MessageDescriptor Descriptor {
+            get { return _PBJ_Internal.Subscribe.Descriptor; }        }
+        public static class Types {
+        }
+        public static bool WithinReservedFieldTagRange(int field_tag) {
+            return false||(field_tag>=1&&field_tag<=6)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
+        }
+        public static bool WithinExtensionFieldTagRange(int field_tag) {
+            return false;
+        }
+        public const int BroadcastAddressFieldTag=7;
+        public bool HasBroadcastAddress{ get {return super.HasBroadcastAddress;} }
+        public Address BroadcastAddress{ get {
+            if (HasBroadcastAddress) {
+                return new Address(super.BroadcastAddress);
+            } else {
+                return new Address();
+            }
+        }
+        }
+        public const int BroadcastNameFieldTag=8;
+        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
+        public PBJ.UUID BroadcastName{ get {
+            if (HasBroadcastName) {
+                return PBJ._PBJ.CastUuid(super.BroadcastName);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+        public const int UpdatePeriodFieldTag=9;
+        public bool HasUpdatePeriod{ get {return super.HasUpdatePeriod&&PBJ._PBJ.ValidateDuration(super.UpdatePeriod);} }
+        public PBJ.Duration UpdatePeriod{ get {
+            if (HasUpdatePeriod) {
+                return PBJ._PBJ.CastDuration(super.UpdatePeriod);
+            } else {
+                return PBJ._PBJ.CastDuration();
+            }
+        }
+        }
+            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
+        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
+        public static Builder CreateBuilder() { return new Builder(); }
+        public static Builder CreateBuilder(Subscribe prototype) {
+            return (Builder)new Builder().MergeFrom(prototype);
+        }
+        public static Subscribe ParseFrom(pb::ByteString data) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
+        }
+        public static Subscribe ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
+        }
+        public static Subscribe ParseFrom(byte[] data) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
+        }
+        public static Subscribe ParseFrom(byte[] data, pb::ExtensionRegistry er) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
+        }
+        public static Subscribe ParseFrom(global::System.IO.Stream data) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
+        }
+        public static Subscribe ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
+        }
+        public static Subscribe ParseFrom(pb::CodedInputStream data) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data));
+        }
+        public static Subscribe ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
+            return new Subscribe(_PBJ_Internal.Subscribe.ParseFrom(data,er));
+        }
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+        public class Builder : global::PBJ.IMessage.IBuilder{
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+            protected _PBJ_Internal.Subscribe.Builder super;
+            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
+            public _PBJ_Internal.Subscribe.Builder _PBJSuper{ get { return super;} }
+            public Builder() {super = new _PBJ_Internal.Subscribe.Builder();}
+            public Builder(_PBJ_Internal.Subscribe.Builder other) {
+                super=other;
+            }
+            public Builder Clone() {return new Builder(super.Clone());}
+            public Builder MergeFrom(Subscribe prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
+            public Builder Clear() {super.Clear();return this;}
+            public Subscribe BuildPartial() {return new Subscribe(super.BuildPartial());}
+            public Subscribe Build() {if (_HasAllPBJFields) return new Subscribe(super.Build());return null;}
+            public pbd::MessageDescriptor DescriptorForType {
+                get { return Subscribe.Descriptor; }            }
+        public Builder ClearBroadcastAddress() { super.ClearBroadcastAddress();return this;}
+        public const int BroadcastAddressFieldTag=7;
+        public bool HasBroadcastAddress{ get {return super.HasBroadcastAddress;} }
+        public Address BroadcastAddress{ get {
+            if (HasBroadcastAddress) {
+                return new Address(super.BroadcastAddress);
+            } else {
+                return new Address();
+            }
+        }
+        set {
+            super.BroadcastAddress=value._PBJSuper;
+        }
+        }
+        public Builder ClearBroadcastName() { super.ClearBroadcastName();return this;}
+        public const int BroadcastNameFieldTag=8;
+        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
+        public PBJ.UUID BroadcastName{ get {
+            if (HasBroadcastName) {
+                return PBJ._PBJ.CastUuid(super.BroadcastName);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.BroadcastName=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearUpdatePeriod() { super.ClearUpdatePeriod();return this;}
+        public const int UpdatePeriodFieldTag=9;
+        public bool HasUpdatePeriod{ get {return super.HasUpdatePeriod&&PBJ._PBJ.ValidateDuration(super.UpdatePeriod);} }
+        public PBJ.Duration UpdatePeriod{ get {
+            if (HasUpdatePeriod) {
+                return PBJ._PBJ.CastDuration(super.UpdatePeriod);
+            } else {
+                return PBJ._PBJ.CastDuration();
+            }
+        }
+        set {
+            super.UpdatePeriod=(PBJ._PBJ.Construct(value));
+        }
+        }
+        }
+    }
+}
+namespace Sirikata.Subscription.Protocol {
+    public class Broadcast : PBJ.IMessage {
+        protected _PBJ_Internal.Broadcast super;
+        public _PBJ_Internal.Broadcast _PBJSuper{ get { return super;} }
+        public Broadcast() {
+            super=new _PBJ_Internal.Broadcast();
+        }
+        public Broadcast(_PBJ_Internal.Broadcast reference) {
+            super=reference;
+        }
+        public static Broadcast defaultInstance= new Broadcast (_PBJ_Internal.Broadcast.DefaultInstance);
+        public static Broadcast DefaultInstance{
+            get {return defaultInstance;}
+        }
+        public static pbd.MessageDescriptor Descriptor {
+            get { return _PBJ_Internal.Broadcast.Descriptor; }        }
+        public static class Types {
+        }
+        public static bool WithinReservedFieldTagRange(int field_tag) {
+            return false||(field_tag>=1&&field_tag<=6)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
+        }
+        public static bool WithinExtensionFieldTagRange(int field_tag) {
+            return false;
+        }
+        public const int BroadcastNameFieldTag=7;
+        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
+        public PBJ.UUID BroadcastName{ get {
+            if (HasBroadcastName) {
+                return PBJ._PBJ.CastUuid(super.BroadcastName);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        }
+            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
+        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
+        public static Builder CreateBuilder() { return new Builder(); }
+        public static Builder CreateBuilder(Broadcast prototype) {
+            return (Builder)new Builder().MergeFrom(prototype);
+        }
+        public static Broadcast ParseFrom(pb::ByteString data) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
+        }
+        public static Broadcast ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
+        }
+        public static Broadcast ParseFrom(byte[] data) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
+        }
+        public static Broadcast ParseFrom(byte[] data, pb::ExtensionRegistry er) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
+        }
+        public static Broadcast ParseFrom(global::System.IO.Stream data) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
+        }
+        public static Broadcast ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
+        }
+        public static Broadcast ParseFrom(pb::CodedInputStream data) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data));
+        }
+        public static Broadcast ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
+            return new Broadcast(_PBJ_Internal.Broadcast.ParseFrom(data,er));
+        }
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+        public class Builder : global::PBJ.IMessage.IBuilder{
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+            protected _PBJ_Internal.Broadcast.Builder super;
+            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
+            public _PBJ_Internal.Broadcast.Builder _PBJSuper{ get { return super;} }
+            public Builder() {super = new _PBJ_Internal.Broadcast.Builder();}
+            public Builder(_PBJ_Internal.Broadcast.Builder other) {
+                super=other;
+            }
+            public Builder Clone() {return new Builder(super.Clone());}
+            public Builder MergeFrom(Broadcast prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
+            public Builder Clear() {super.Clear();return this;}
+            public Broadcast BuildPartial() {return new Broadcast(super.BuildPartial());}
+            public Broadcast Build() {if (_HasAllPBJFields) return new Broadcast(super.Build());return null;}
+            public pbd::MessageDescriptor DescriptorForType {
+                get { return Broadcast.Descriptor; }            }
+        public Builder ClearBroadcastName() { super.ClearBroadcastName();return this;}
+        public const int BroadcastNameFieldTag=7;
+        public bool HasBroadcastName{ get {return super.HasBroadcastName&&PBJ._PBJ.ValidateUuid(super.BroadcastName);} }
+        public PBJ.UUID BroadcastName{ get {
+            if (HasBroadcastName) {
+                return PBJ._PBJ.CastUuid(super.BroadcastName);
+            } else {
+                return PBJ._PBJ.CastUuid();
+            }
+        }
+        set {
+            super.BroadcastName=(PBJ._PBJ.Construct(value));
+        }
+        }
+        }
+    }
+}

OpenSim/Client/Sirikata/Protocol/Time.cs

@@ -0,0 +1,454 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+
+using pb = global::Google.ProtocolBuffers;
+using pbc = global::Google.ProtocolBuffers.Collections;
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using scg = global::System.Collections.Generic;
+namespace Sirikata.Network.Protocol._PBJ_Internal {
+  
+  public static partial class Time {
+  
+    #region Extension registration
+    public static void RegisterAllExtensions(pb::ExtensionRegistry registry) {
+    }
+    #endregion
+    #region Static variables
+    internal static pbd::MessageDescriptor internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor;
+    internal static pb::FieldAccess.FieldAccessorTable<global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync, global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.Builder> internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__FieldAccessorTable;
+    #endregion
+    #region Descriptor
+    public static pbd::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbd::FileDescriptor descriptor;
+    
+    static Time() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          "CgpUaW1lLnByb3RvEidTaXJpa2F0YS5OZXR3b3JrLlByb3RvY29sLl9QQkpf" + 
+          "SW50ZXJuYWwirQEKCFRpbWVTeW5jEhMKC2NsaWVudF90aW1lGAkgASgGEhMK" + 
+          "C3NlcnZlcl90aW1lGAogASgGEhIKCnN5bmNfcm91bmQYCyABKAQSFgoOcmV0" + 
+          "dXJuX29wdGlvbnMYDiABKA0SEwoKcm91bmRfdHJpcBiBFCABKAYiNgoNUmV0" + 
+          "dXJuT3B0aW9ucxISCg5SRVBMWV9SRUxJQUJMRRABEhEKDVJFUExZX09SREVS" + 
+          "RUQQAg==");
+      pbd::FileDescriptor.InternalDescriptorAssigner assigner = delegate(pbd::FileDescriptor root) {
+        descriptor = root;
+        internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor = Descriptor.MessageTypes[0];
+        internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__FieldAccessorTable = 
+            new pb::FieldAccess.FieldAccessorTable<global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync, global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.Builder>(internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor,
+                new string[] { "ClientTime", "ServerTime", "SyncRound", "ReturnOptions", "RoundTrip", });
+        return null;
+      };
+      pbd::FileDescriptor.InternalBuildGeneratedFileFrom(descriptorData,
+          new pbd::FileDescriptor[] {
+          }, assigner);
+    }
+    #endregion
+    
+  }
+  #region Messages
+  public sealed partial class TimeSync : pb::GeneratedMessage<TimeSync, TimeSync.Builder> {
+    private static readonly TimeSync defaultInstance = new Builder().BuildPartial();
+    public static TimeSync DefaultInstance {
+      get { return defaultInstance; }
+    }
+    
+    public override TimeSync DefaultInstanceForType {
+      get { return defaultInstance; }
+    }
+    
+    protected override TimeSync ThisMessage {
+      get { return this; }
+    }
+    
+    public static pbd::MessageDescriptor Descriptor {
+      get { return global::Sirikata.Network.Protocol._PBJ_Internal.Time.internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__Descriptor; }
+    }
+    
+    protected override pb::FieldAccess.FieldAccessorTable<TimeSync, TimeSync.Builder> InternalFieldAccessors {
+      get { return global::Sirikata.Network.Protocol._PBJ_Internal.Time.internal__static_Sirikata_Network_Protocol__PBJ_Internal_TimeSync__FieldAccessorTable; }
+    }
+    
+    #region Nested types
+    public static class Types {
+      public enum ReturnOptions {
+        REPLY_RELIABLE = 1,
+        REPLY_ORDERED = 2,
+      }
+      
+    }
+    #endregion
+    
+    public const int ClientTimeFieldNumber = 9;
+    private bool hasClientTime;
+    private ulong clientTime_ = 0;
+    public bool HasClientTime {
+      get { return hasClientTime; }
+    }
+    [global::System.CLSCompliant(false)]
+    public ulong ClientTime {
+      get { return clientTime_; }
+    }
+    
+    public const int ServerTimeFieldNumber = 10;
+    private bool hasServerTime;
+    private ulong serverTime_ = 0;
+    public bool HasServerTime {
+      get { return hasServerTime; }
+    }
+    [global::System.CLSCompliant(false)]
+    public ulong ServerTime {
+      get { return serverTime_; }
+    }
+    
+    public const int SyncRoundFieldNumber = 11;
+    private bool hasSyncRound;
+    private ulong syncRound_ = 0UL;
+    public bool HasSyncRound {
+      get { return hasSyncRound; }
+    }
+    [global::System.CLSCompliant(false)]
+    public ulong SyncRound {
+      get { return syncRound_; }
+    }
+    
+    public const int ReturnOptionsFieldNumber = 14;
+    private bool hasReturnOptions;
+    private uint returnOptions_ = 0;
+    public bool HasReturnOptions {
+      get { return hasReturnOptions; }
+    }
+    [global::System.CLSCompliant(false)]
+    public uint ReturnOptions {
+      get { return returnOptions_; }
+    }
+    
+    public const int RoundTripFieldNumber = 2561;
+    private bool hasRoundTrip;
+    private ulong roundTrip_ = 0;
+    public bool HasRoundTrip {
+      get { return hasRoundTrip; }
+    }
+    [global::System.CLSCompliant(false)]
+    public ulong RoundTrip {
+      get { return roundTrip_; }
+    }
+    
+    public override bool IsInitialized {
+      get {
+        return true;
+      }
+    }
+    
+    public override void WriteTo(pb::CodedOutputStream output) {
+      if (HasClientTime) {
+        output.WriteFixed64(9, ClientTime);
+      }
+      if (HasServerTime) {
+        output.WriteFixed64(10, ServerTime);
+      }
+      if (HasSyncRound) {
+        output.WriteUInt64(11, SyncRound);
+      }
+      if (HasReturnOptions) {
+        output.WriteUInt32(14, ReturnOptions);
+      }
+      if (HasRoundTrip) {
+        output.WriteFixed64(2561, RoundTrip);
+      }
+      UnknownFields.WriteTo(output);
+    }
+    
+    private int memoizedSerializedSize = -1;
+    public override int SerializedSize {
+      get {
+        int size = memoizedSerializedSize;
+        if (size != -1) return size;
+        
+        size = 0;
+        if (HasClientTime) {
+          size += pb::CodedOutputStream.ComputeFixed64Size(9, ClientTime);
+        }
+        if (HasServerTime) {
+          size += pb::CodedOutputStream.ComputeFixed64Size(10, ServerTime);
+        }
+        if (HasSyncRound) {
+          size += pb::CodedOutputStream.ComputeUInt64Size(11, SyncRound);
+        }
+        if (HasReturnOptions) {
+          size += pb::CodedOutputStream.ComputeUInt32Size(14, ReturnOptions);
+        }
+        if (HasRoundTrip) {
+          size += pb::CodedOutputStream.ComputeFixed64Size(2561, RoundTrip);
+        }
+        size += UnknownFields.SerializedSize;
+        memoizedSerializedSize = size;
+        return size;
+      }
+    }
+    
+    public static TimeSync ParseFrom(pb::ByteString data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static TimeSync ParseFrom(pb::ByteString data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static TimeSync ParseFrom(byte[] data) {
+      return ((Builder) CreateBuilder().MergeFrom(data)).BuildParsed();
+    }
+    public static TimeSync ParseFrom(byte[] data, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(data, extensionRegistry)).BuildParsed();
+    }
+    public static TimeSync ParseFrom(global::System.IO.Stream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static TimeSync ParseFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static TimeSync ParseDelimitedFrom(global::System.IO.Stream input) {
+      return CreateBuilder().MergeDelimitedFrom(input).BuildParsed();
+    }
+    public static TimeSync ParseDelimitedFrom(global::System.IO.Stream input, pb::ExtensionRegistry extensionRegistry) {
+      return CreateBuilder().MergeDelimitedFrom(input, extensionRegistry).BuildParsed();
+    }
+    public static TimeSync ParseFrom(pb::CodedInputStream input) {
+      return ((Builder) CreateBuilder().MergeFrom(input)).BuildParsed();
+    }
+    public static TimeSync ParseFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+      return ((Builder) CreateBuilder().MergeFrom(input, extensionRegistry)).BuildParsed();
+    }
+    public static Builder CreateBuilder() { return new Builder(); }
+    public override Builder ToBuilder() { return CreateBuilder(this); }
+    public override Builder CreateBuilderForType() { return new Builder(); }
+    public static Builder CreateBuilder(TimeSync prototype) {
+      return (Builder) new Builder().MergeFrom(prototype);
+    }
+    
+    public sealed partial class Builder : pb::GeneratedBuilder<TimeSync, Builder> {
+      protected override Builder ThisBuilder {
+        get { return this; }
+      }
+      public Builder() {}
+      
+      TimeSync result = new TimeSync();
+      
+      protected override TimeSync MessageBeingBuilt {
+        get { return result; }
+      }
+      
+      public override Builder Clear() {
+        result = new TimeSync();
+        return this;
+      }
+      
+      public override Builder Clone() {
+        return new Builder().MergeFrom(result);
+      }
+      
+      public override pbd::MessageDescriptor DescriptorForType {
+        get { return global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.Descriptor; }
+      }
+      
+      public override TimeSync DefaultInstanceForType {
+        get { return global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.DefaultInstance; }
+      }
+      
+      public override TimeSync BuildPartial() {
+        if (result == null) {
+          throw new global::System.InvalidOperationException("build() has already been called on this Builder");
+        }
+        TimeSync returnMe = result;
+        result = null;
+        return returnMe;
+      }
+      
+      public override Builder MergeFrom(pb::IMessage other) {
+        if (other is TimeSync) {
+          return MergeFrom((TimeSync) other);
+        } else {
+          base.MergeFrom(other);
+          return this;
+        }
+      }
+      
+      public override Builder MergeFrom(TimeSync other) {
+        if (other == global::Sirikata.Network.Protocol._PBJ_Internal.TimeSync.DefaultInstance) return this;
+        if (other.HasClientTime) {
+          ClientTime = other.ClientTime;
+        }
+        if (other.HasServerTime) {
+          ServerTime = other.ServerTime;
+        }
+        if (other.HasSyncRound) {
+          SyncRound = other.SyncRound;
+        }
+        if (other.HasReturnOptions) {
+          ReturnOptions = other.ReturnOptions;
+        }
+        if (other.HasRoundTrip) {
+          RoundTrip = other.RoundTrip;
+        }
+        this.MergeUnknownFields(other.UnknownFields);
+        return this;
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input) {
+        return MergeFrom(input, pb::ExtensionRegistry.Empty);
+      }
+      
+      public override Builder MergeFrom(pb::CodedInputStream input, pb::ExtensionRegistry extensionRegistry) {
+        pb::UnknownFieldSet.Builder unknownFields = null;
+        while (true) {
+          uint tag = input.ReadTag();
+          switch (tag) {
+            case 0: {
+              if (unknownFields != null) {
+                this.UnknownFields = unknownFields.Build();
+              }
+              return this;
+            }
+            default: {
+              if (pb::WireFormat.IsEndGroupTag(tag)) {
+                if (unknownFields != null) {
+                  this.UnknownFields = unknownFields.Build();
+                }
+                return this;
+              }
+              if (unknownFields == null) {
+                unknownFields = pb::UnknownFieldSet.CreateBuilder(this.UnknownFields);
+              }
+              ParseUnknownField(input, unknownFields, extensionRegistry, tag);
+              break;
+            }
+            case 73: {
+              ClientTime = input.ReadFixed64();
+              break;
+            }
+            case 81: {
+              ServerTime = input.ReadFixed64();
+              break;
+            }
+            case 88: {
+              SyncRound = input.ReadUInt64();
+              break;
+            }
+            case 112: {
+              ReturnOptions = input.ReadUInt32();
+              break;
+            }
+            case 20489: {
+              RoundTrip = input.ReadFixed64();
+              break;
+            }
+          }
+        }
+      }
+      
+      
+      public bool HasClientTime {
+        get { return result.HasClientTime; }
+      }
+      [global::System.CLSCompliant(false)]
+      public ulong ClientTime {
+        get { return result.ClientTime; }
+        set { SetClientTime(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetClientTime(ulong value) {
+        result.hasClientTime = true;
+        result.clientTime_ = value;
+        return this;
+      }
+      public Builder ClearClientTime() {
+        result.hasClientTime = false;
+        result.clientTime_ = 0;
+        return this;
+      }
+      
+      public bool HasServerTime {
+        get { return result.HasServerTime; }
+      }
+      [global::System.CLSCompliant(false)]
+      public ulong ServerTime {
+        get { return result.ServerTime; }
+        set { SetServerTime(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetServerTime(ulong value) {
+        result.hasServerTime = true;
+        result.serverTime_ = value;
+        return this;
+      }
+      public Builder ClearServerTime() {
+        result.hasServerTime = false;
+        result.serverTime_ = 0;
+        return this;
+      }
+      
+      public bool HasSyncRound {
+        get { return result.HasSyncRound; }
+      }
+      [global::System.CLSCompliant(false)]
+      public ulong SyncRound {
+        get { return result.SyncRound; }
+        set { SetSyncRound(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetSyncRound(ulong value) {
+        result.hasSyncRound = true;
+        result.syncRound_ = value;
+        return this;
+      }
+      public Builder ClearSyncRound() {
+        result.hasSyncRound = false;
+        result.syncRound_ = 0UL;
+        return this;
+      }
+      
+      public bool HasReturnOptions {
+        get { return result.HasReturnOptions; }
+      }
+      [global::System.CLSCompliant(false)]
+      public uint ReturnOptions {
+        get { return result.ReturnOptions; }
+        set { SetReturnOptions(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetReturnOptions(uint value) {
+        result.hasReturnOptions = true;
+        result.returnOptions_ = value;
+        return this;
+      }
+      public Builder ClearReturnOptions() {
+        result.hasReturnOptions = false;
+        result.returnOptions_ = 0;
+        return this;
+      }
+      
+      public bool HasRoundTrip {
+        get { return result.HasRoundTrip; }
+      }
+      [global::System.CLSCompliant(false)]
+      public ulong RoundTrip {
+        get { return result.RoundTrip; }
+        set { SetRoundTrip(value); }
+      }
+      [global::System.CLSCompliant(false)]
+      public Builder SetRoundTrip(ulong value) {
+        result.hasRoundTrip = true;
+        result.roundTrip_ = value;
+        return this;
+      }
+      public Builder ClearRoundTrip() {
+        result.hasRoundTrip = false;
+        result.roundTrip_ = 0;
+        return this;
+      }
+    }
+    static TimeSync() {
+      object.ReferenceEquals(global::Sirikata.Network.Protocol._PBJ_Internal.Time.Descriptor, null);
+    }
+  }
+  
+  #endregion
+  
+}

OpenSim/Client/Sirikata/Protocol/Time.pbj.cs

@@ -0,0 +1,218 @@
+using pbd = global::Google.ProtocolBuffers.Descriptors;
+using pb = global::Google.ProtocolBuffers;
+namespace Sirikata.Network.Protocol {
+    public class TimeSync : PBJ.IMessage {
+        protected _PBJ_Internal.TimeSync super;
+        public _PBJ_Internal.TimeSync _PBJSuper{ get { return super;} }
+        public TimeSync() {
+            super=new _PBJ_Internal.TimeSync();
+        }
+        public TimeSync(_PBJ_Internal.TimeSync reference) {
+            super=reference;
+        }
+        public static TimeSync defaultInstance= new TimeSync (_PBJ_Internal.TimeSync.DefaultInstance);
+        public static TimeSync DefaultInstance{
+            get {return defaultInstance;}
+        }
+        public static pbd.MessageDescriptor Descriptor {
+            get { return _PBJ_Internal.TimeSync.Descriptor; }        }
+        public static class Types {
+        public enum ReturnOptions {
+            REPLY_RELIABLE=_PBJ_Internal.TimeSync.Types.ReturnOptions.REPLY_RELIABLE,
+            REPLY_ORDERED=_PBJ_Internal.TimeSync.Types.ReturnOptions.REPLY_ORDERED
+        };
+        }
+        public static bool WithinReservedFieldTagRange(int field_tag) {
+            return false||(field_tag>=1&&field_tag<=8)||(field_tag>=1536&&field_tag<=2560)||(field_tag>=229376&&field_tag<=294912);
+        }
+        public static bool WithinExtensionFieldTagRange(int field_tag) {
+            return false;
+        }
+        public const int ClientTimeFieldTag=9;
+        public bool HasClientTime{ get {return super.HasClientTime&&PBJ._PBJ.ValidateTime(super.ClientTime);} }
+        public PBJ.Time ClientTime{ get {
+            if (HasClientTime) {
+                return PBJ._PBJ.CastTime(super.ClientTime);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        }
+        public const int ServerTimeFieldTag=10;
+        public bool HasServerTime{ get {return super.HasServerTime&&PBJ._PBJ.ValidateTime(super.ServerTime);} }
+        public PBJ.Time ServerTime{ get {
+            if (HasServerTime) {
+                return PBJ._PBJ.CastTime(super.ServerTime);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        }
+        public const int SyncRoundFieldTag=11;
+        public bool HasSyncRound{ get {return super.HasSyncRound&&PBJ._PBJ.ValidateUint64(super.SyncRound);} }
+        public ulong SyncRound{ get {
+            if (HasSyncRound) {
+                return PBJ._PBJ.CastUint64(super.SyncRound);
+            } else {
+                return PBJ._PBJ.CastUint64();
+            }
+        }
+        }
+        public const int ReturnOptionsFieldTag=14;
+        public bool HasReturnOptions { get {
+            if (!super.HasReturnOptions) return false;
+            return PBJ._PBJ.ValidateFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
+        } }
+        public uint ReturnOptions{ get {
+            if (HasReturnOptions) {
+                return (uint)PBJ._PBJ.CastFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
+            } else {
+                return (uint)PBJ._PBJ.CastFlags((ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
+            }
+        }
+        }
+        public const int RoundTripFieldTag=2561;
+        public bool HasRoundTrip{ get {return super.HasRoundTrip&&PBJ._PBJ.ValidateTime(super.RoundTrip);} }
+        public PBJ.Time RoundTrip{ get {
+            if (HasRoundTrip) {
+                return PBJ._PBJ.CastTime(super.RoundTrip);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        }
+            public override Google.ProtocolBuffers.IMessage _PBJISuper { get { return super; } }
+        public override PBJ.IMessage.IBuilder WeakCreateBuilderForType() { return new Builder(); }
+        public static Builder CreateBuilder() { return new Builder(); }
+        public static Builder CreateBuilder(TimeSync prototype) {
+            return (Builder)new Builder().MergeFrom(prototype);
+        }
+        public static TimeSync ParseFrom(pb::ByteString data) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
+        }
+        public static TimeSync ParseFrom(pb::ByteString data, pb::ExtensionRegistry er) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
+        }
+        public static TimeSync ParseFrom(byte[] data) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
+        }
+        public static TimeSync ParseFrom(byte[] data, pb::ExtensionRegistry er) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
+        }
+        public static TimeSync ParseFrom(global::System.IO.Stream data) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
+        }
+        public static TimeSync ParseFrom(global::System.IO.Stream data, pb::ExtensionRegistry er) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
+        }
+        public static TimeSync ParseFrom(pb::CodedInputStream data) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data));
+        }
+        public static TimeSync ParseFrom(pb::CodedInputStream data, pb::ExtensionRegistry er) {
+            return new TimeSync(_PBJ_Internal.TimeSync.ParseFrom(data,er));
+        }
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+        public class Builder : global::PBJ.IMessage.IBuilder{
+        protected override bool _HasAllPBJFields{ get {
+            return true
+                ;
+        } }
+        public bool IsInitialized { get {
+            return super.IsInitialized&&_HasAllPBJFields;
+        } }
+            protected _PBJ_Internal.TimeSync.Builder super;
+            public override Google.ProtocolBuffers.IBuilder _PBJISuper { get { return super; } }
+            public _PBJ_Internal.TimeSync.Builder _PBJSuper{ get { return super;} }
+            public Builder() {super = new _PBJ_Internal.TimeSync.Builder();}
+            public Builder(_PBJ_Internal.TimeSync.Builder other) {
+                super=other;
+            }
+            public Builder Clone() {return new Builder(super.Clone());}
+            public Builder MergeFrom(TimeSync prototype) { super.MergeFrom(prototype._PBJSuper);return this;}
+            public Builder Clear() {super.Clear();return this;}
+            public TimeSync BuildPartial() {return new TimeSync(super.BuildPartial());}
+            public TimeSync Build() {if (_HasAllPBJFields) return new TimeSync(super.Build());return null;}
+            public pbd::MessageDescriptor DescriptorForType {
+                get { return TimeSync.Descriptor; }            }
+        public Builder ClearClientTime() { super.ClearClientTime();return this;}
+        public const int ClientTimeFieldTag=9;
+        public bool HasClientTime{ get {return super.HasClientTime&&PBJ._PBJ.ValidateTime(super.ClientTime);} }
+        public PBJ.Time ClientTime{ get {
+            if (HasClientTime) {
+                return PBJ._PBJ.CastTime(super.ClientTime);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        set {
+            super.ClientTime=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearServerTime() { super.ClearServerTime();return this;}
+        public const int ServerTimeFieldTag=10;
+        public bool HasServerTime{ get {return super.HasServerTime&&PBJ._PBJ.ValidateTime(super.ServerTime);} }
+        public PBJ.Time ServerTime{ get {
+            if (HasServerTime) {
+                return PBJ._PBJ.CastTime(super.ServerTime);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        set {
+            super.ServerTime=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearSyncRound() { super.ClearSyncRound();return this;}
+        public const int SyncRoundFieldTag=11;
+        public bool HasSyncRound{ get {return super.HasSyncRound&&PBJ._PBJ.ValidateUint64(super.SyncRound);} }
+        public ulong SyncRound{ get {
+            if (HasSyncRound) {
+                return PBJ._PBJ.CastUint64(super.SyncRound);
+            } else {
+                return PBJ._PBJ.CastUint64();
+            }
+        }
+        set {
+            super.SyncRound=(PBJ._PBJ.Construct(value));
+        }
+        }
+        public Builder ClearReturnOptions() { super.ClearReturnOptions();return this;}
+        public const int ReturnOptionsFieldTag=14;
+        public bool HasReturnOptions { get {
+            if (!super.HasReturnOptions) return false;
+            return PBJ._PBJ.ValidateFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
+        } }
+        public uint ReturnOptions{ get {
+            if (HasReturnOptions) {
+                return (uint)PBJ._PBJ.CastFlags(super.ReturnOptions,(ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
+            } else {
+                return (uint)PBJ._PBJ.CastFlags((ulong)Types.ReturnOptions.REPLY_RELIABLE|(ulong)Types.ReturnOptions.REPLY_ORDERED);
+            }
+        }
+        set {
+            super.ReturnOptions=((value));
+        }
+        }
+        public Builder ClearRoundTrip() { super.ClearRoundTrip();return this;}
+        public const int RoundTripFieldTag=2561;
+        public bool HasRoundTrip{ get {return super.HasRoundTrip&&PBJ._PBJ.ValidateTime(super.RoundTrip);} }
+        public PBJ.Time RoundTrip{ get {
+            if (HasRoundTrip) {
+                return PBJ._PBJ.CastTime(super.RoundTrip);
+            } else {
+                return PBJ._PBJ.CastTime();
+            }
+        }
+        set {
+            super.RoundTrip=(PBJ._PBJ.Construct(value));
+        }
+        }
+        }
+    }
+}

OpenSim/Client/Sirikata/SirikataModule.cs

@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+// THIS MODULE USES CODE FROM SIRIKATA, THE SIRIKATA LICENSE IS BELOW
+/*
+Sirikata is Licensed using the revised BSD license.
+If you have any questions, contact Patrick Horn at <patrick.horn@gmail.com>
+
+
+ Copyright (c) 2008, the Sirikata developers (see AUTHORS file for credit).
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ * Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+ * Neither the name of Sirikata nor the names of its contributors may
+   be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using System.Net.Sockets;
+using Nini.Config;
+using OpenMetaverse;
+using OpenSim.Client.Sirikata.ClientStack;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+namespace OpenSim.Client.Sirikata
+{
+    class SirikataModule : IRegionModule
+    {
+        private bool m_enabled = false;
+
+        private TcpListener m_listener;
+        private bool m_running = true;
+
+        private List<Scene> m_scenes = new List<Scene>();
+        private Dictionary<UUID,SirikataClientView> m_clients = new Dictionary<UUID, SirikataClientView>();
+
+        #region Implementation of IRegionModule
+
+        public void Initialise(Scene scene, IConfigSource source)
+        {
+            lock (m_scenes)
+                m_scenes.Add(scene);
+        }
+
+        public void PostInitialise()
+        {
+            if(!m_enabled)
+                return;
+
+            m_listener = new TcpListener(IPAddress.Any, 5943);
+            
+        }
+
+        private void ListenLoop()
+        {
+            while(m_running)
+            {
+                m_listener.BeginAcceptTcpClient(AcceptSocket, m_listener);
+            }
+        }
+
+        private void AcceptSocket(IAsyncResult ar)
+        {
+            TcpListener listener = (TcpListener) ar.AsyncState;
+            TcpClient client = listener.EndAcceptTcpClient(ar);
+
+            SirikataClientView clientView = new SirikataClientView(client);
+
+            lock (m_clients)
+                m_clients.Add(clientView.SessionId, clientView);
+        }
+
+        public void Close()
+        {
+            
+        }
+
+        public string Name
+        {
+            get { return "Sirikata ClientStack Module"; }
+        }
+
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
+        #endregion
+    }
+}

OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs

@@ -4857,6 +4857,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 UserProfile.FirstLifeImage = Properties.FLImageID;
                 UserProfile.Image = Properties.ImageID;
                 UserProfile.ProfileUrl = Utils.BytesToString(Properties.ProfileURL);
+                Userprofile.Flags &= ~3;
+                Userprofile.Flags |= Properties.AllowPublish ? 1 : 0;
+                Userprofile.Flags |= Properties.MaturePublish ? 2 : 0;
 
                 handlerUpdateAvatarProperties(this, UserProfile);
             }

ThirdPartyLicenses/GoogleProtoBuffer.txt

@@ -0,0 +1,31 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// http://github.com/jskeet/dotnet-protobufs/
+// Original C++/Java/Python code:
+// http://code.google.com/p/protobuf/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

prebuild.xml

@@ -2307,6 +2307,39 @@
       </Files>
     </Project>
 
+
+    <Project frameworkVersion="v3_5" name="OpenSim.Client.Sirikata" path="OpenSim/Client/Sirikata" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../bin/</ReferencePath>
+
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="System"/>
+	  <Reference name="System.Drawing"/>
+      <Reference name="OpenSim.Framework"/>
+	  <Reference name="OpenSim.Framework.Servers"/>
+	  <Reference name="OpenSim.Framework.Servers.HttpServer"/>
+      <Reference name="OpenSim.Region.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>
+	  <Reference name="Google.ProtocolBuffers.dll"/>
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+	</Project>
+	
     <Project frameworkVersion="v3_5" name="OpenSim.Client.VWoHTTP" path="OpenSim/Client/VWoHTTP" type="Library">
       <Configuration name="Debug">
         <Options>