aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs3
-rw-r--r--OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs4
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
index 380705f..ec574a3 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Capabilities.Handlers
64 ret["keepalive"] = false; 64 ret["keepalive"] = false;
65 ret["reusecontext"] = false; 65 ret["reusecontext"] = false;
66 ret["int_bytes"] = 0; 66 ret["int_bytes"] = 0;
67 ret["int_lod"] = 0;
67 string MeshStr = (string)request["mesh_id"]; 68 string MeshStr = (string)request["mesh_id"];
68 69
69 70
@@ -100,6 +101,8 @@ namespace OpenSim.Capabilities.Handlers
100 responsedata["keepalive"] = false; 101 responsedata["keepalive"] = false;
101 responsedata["str_response_string"] = "Request wasn't what was expected"; 102 responsedata["str_response_string"] = "Request wasn't what was expected";
102 responsedata["reusecontext"] = false; 103 responsedata["reusecontext"] = false;
104 responsedata["int_lod"] = 0;
105 responsedata["int_bytes"] = 0;
103 106
104 string meshStr = string.Empty; 107 string meshStr = string.Empty;
105 108
diff --git a/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
index 4e84364..026ceca 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
107 m_scene.AddCommand( 107 m_scene.AddCommand(
108 "Friends", this, "friends show", 108 "Friends", this, "friends show",
109 "friends show [--cache] <first-name> <last-name>", 109 "friends show [--cache] <first-name> <last-name>",
110 "Show the friends for the given user if they exist.\n", 110 "Show the friends for the given user if they exist.",
111 "The --cache option will show locally cached information for that user.", 111 "The --cache option will show locally cached information for that user.",
112 HandleFriendsShowCommand); 112 HandleFriendsShowCommand);
113 } 113 }
@@ -197,4 +197,4 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
197 } 197 }
198 } 198 }
199 } 199 }
200} \ No newline at end of file 200}