Merge branch 'spaces-merge' into roxie/webrtc-voice

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/llcommon/llsdjson.h b/indra/llcommon/llsdjson.h
index e56cf03b45..79bf2c56fa 100644
--- a/indra/llcommon/llsdjson.h
+++ b/indra/llcommon/llsdjson.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsdjson.cpp
  * @brief LLSD flexible data system
  *
  * $LicenseInfo:firstyear=2015&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2015, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -36,10 +36,10 @@
 #include "llsd.h"
 #include "json/value.h"
 
-/// Convert a parsed JSON structure into LLSD maintaining member names and 
+/// Convert a parsed JSON structure into LLSD maintaining member names and
 /// array indexes.
 /// JSON/JavaScript types are converted as follows:
-/// 
+///
 /// JSON Type     | LLSD Type
 /// --------------+--------------
 ///  null         |  undefined
@@ -50,14 +50,14 @@
 ///  boolean      |  LLSD::Boolean
 ///  array        |  LLSD::Array
 ///  object       |  LLSD::Map
-///  
+///
 /// For maps and arrays child entries will be converted and added to the structure.
 /// Order is preserved for an array but not for objects.
 LLSD LlsdFromJson(const Json::Value &val);
 
-/// Convert an LLSD object into Parsed JSON object maintaining member names and 
+/// Convert an LLSD object into Parsed JSON object maintaining member names and
 /// array indexs.
-/// 
+///
 /// Types are converted as follows:
 /// LLSD Type     |  JSON Type
 /// --------------+----------------
@@ -71,7 +71,7 @@ LLSD LlsdFromJson(const Json::Value &val);
 /// TypeUUID      | string
 /// TypeMap       | object
 /// TypeArray     | array
-/// TypeBinary    | unsupported 
+/// TypeBinary    | unsupported
 Json::Value LlsdToJson(const LLSD &val);
 
 #endif // LL_LLSDJSON_H