OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'avination' into careminster

avinationmerge
Melanie 2012-11-25 14:14:20 +00:00
parent fd7a83f439 ae8d3815c7
commit cf670c01cc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Capabilities/Handlers/GetMesh/GetMeshHandler.cs
View File

@ -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;

4
OpenSim/Region/OptionalModules/Avatar/Friends/FriendsCommandsModule.cs
View File

@ -107,7 +107,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.Friends
m_scene.AddCommand(
"Friends", this, "friends show",
"friends show [--cache] <first-name> <last-name>",
"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
}
}
}
}
}