Merge branch 'master' into presence-refactor

1 files changed, 36 insertions, 9 deletions

diff --git a/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs b/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
index 54ca1f4..196b0b9 100644
--- a/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
+++ b/OpenSim/Client/Sirikata/Protocol/Persistence.pbj.cs
@@ -1,3 +1,30 @@
+/*
+ * 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.
+ */
+
 using pbd = global::Google.ProtocolBuffers.Descriptors;
 using pb = global::Google.ProtocolBuffers;
 namespace Sirikata.Persistence.Protocol {
@@ -812,7 +839,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Reads(int index) {
             return new StorageElement(super.GetReads(index));
         }
-        public Builder AddReads(StorageElement value ) {
+        public Builder AddReads(StorageElement value) {
             super.AddReads(value._PBJSuper);
             return this;
         }
@@ -919,7 +946,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Reads(int index) {
             return new StorageElement(super.GetReads(index));
         }
-        public Builder AddReads(StorageElement value ) {
+        public Builder AddReads(StorageElement value) {
             super.AddReads(value._PBJSuper);
             return this;
         }
@@ -1026,7 +1053,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Writes(int index) {
             return new StorageElement(super.GetWrites(index));
         }
-        public Builder AddWrites(StorageElement value ) {
+        public Builder AddWrites(StorageElement value) {
             super.AddWrites(value._PBJSuper);
             return this;
         }
@@ -1155,7 +1182,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Reads(int index) {
             return new StorageElement(super.GetReads(index));
         }
-        public Builder AddReads(StorageElement value ) {
+        public Builder AddReads(StorageElement value) {
             super.AddReads(value._PBJSuper);
             return this;
         }
@@ -1170,7 +1197,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Writes(int index) {
             return new StorageElement(super.GetWrites(index));
         }
-        public Builder AddWrites(StorageElement value ) {
+        public Builder AddWrites(StorageElement value) {
             super.AddWrites(value._PBJSuper);
             return this;
         }
@@ -1322,7 +1349,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Reads(int index) {
             return new StorageElement(super.GetReads(index));
         }
-        public Builder AddReads(StorageElement value ) {
+        public Builder AddReads(StorageElement value) {
             super.AddReads(value._PBJSuper);
             return this;
         }
@@ -1337,7 +1364,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Writes(int index) {
             return new StorageElement(super.GetWrites(index));
         }
-        public Builder AddWrites(StorageElement value ) {
+        public Builder AddWrites(StorageElement value) {
             super.AddWrites(value._PBJSuper);
             return this;
         }
@@ -1352,7 +1379,7 @@ namespace Sirikata.Persistence.Protocol {
         public CompareElement Compares(int index) {
             return new CompareElement(super.GetCompares(index));
         }
-        public Builder AddCompares(CompareElement value ) {
+        public Builder AddCompares(CompareElement value) {
             super.AddCompares(value._PBJSuper);
             return this;
         }
@@ -1493,7 +1520,7 @@ namespace Sirikata.Persistence.Protocol {
         public StorageElement Reads(int index) {
             return new StorageElement(super.GetReads(index));
         }
-        public Builder AddReads(StorageElement value ) {
+        public Builder AddReads(StorageElement value) {
             super.AddReads(value._PBJSuper);
             return this;
         }