From edb3a9596bc589b91c6392069d486956d6fb9d27 Mon Sep 17 00:00:00 2001 From: Melanie Date: Fri, 23 Nov 2012 03:31:44 +0100 Subject: [PATCH 1/3] Remove a superfluous newline from help --- .../OptionalModules/Avatar/Friends/FriendsCommandsModule.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs index 4e84364dd3..026ceca891 100644 --- a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs @@ -107,7 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends m_scene.AddCommand( "Friends", this, "friends show", "friends show [--cache] ", - "Show the friends for the given user if they exist.\n", + "Show the friends for the given user if they exist.", "The --cache option will show locally cached information for that user.", HandleFriendsShowCommand); } @@ -197,4 +197,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends } } } -} \ No newline at end of file +} From 1487d69734dd596bad6fcfcc8d00fe7227d4cb14 Mon Sep 17 00:00:00 2001 From: teravus Date: Sat, 24 Nov 2012 22:01:34 -0500 Subject: [PATCH 2/3] * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339 --- OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs index 380705f9ee..80f65fed52 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs @@ -100,6 +100,8 @@ namespace OpenSim.Capabilities.Handlers responsedata["keepalive"] = false; responsedata["str_response_string"] = "Request wasn't what was expected"; responsedata["reusecontext"] = false; + responsedata["int_lod"] = 0; + responsedata["int_bytes"] = 0; string meshStr = string.Empty; From a118001181adfe27b5d0cc715e9f8c949673a9ef Mon Sep 17 00:00:00 2001 From: teravus Date: Sat, 24 Nov 2012 22:01:34 -0500 Subject: [PATCH 3/3] * Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339 --- OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs index 380705f9ee..ec574a3e62 100644 --- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs @@ -64,6 +64,7 @@ namespace OpenSim.Capabilities.Handlers ret["keepalive"] = false; ret["reusecontext"] = false; ret["int_bytes"] = 0; + ret["int_lod"] = 0; string MeshStr = (string)request["mesh_id"]; @@ -100,6 +101,8 @@ namespace OpenSim.Capabilities.Handlers responsedata["keepalive"] = false; responsedata["str_response_string"] = "Request wasn't what was expected"; responsedata["reusecontext"] = false; + responsedata["int_lod"] = 0; + responsedata["int_bytes"] = 0; string meshStr = string.Empty;