diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs index 1b68603..44bf1a5 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs | |||
| @@ -133,7 +133,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 133 | // data["username"] = sp.Firstname + "." + sp.Lastname; | 133 | // data["username"] = sp.Firstname + "." + sp.Lastname; |
| 134 | // data["display_name_next_update"] = new OSDDate(DateTime.Now); | 134 | // data["display_name_next_update"] = new OSDDate(DateTime.Now); |
| 135 | // data["legacy_first_name"] = sp.Firstname; | 135 | // data["legacy_first_name"] = sp.Firstname; |
| 136 | data["mesh_upload_status"] = "valid"; | 136 | data["mesh_upload_status"] = "valid"; |
| 137 | // data["display_name"] = sp.Firstname + " " + sp.Lastname; | 137 | // data["display_name"] = sp.Firstname + " " + sp.Lastname; |
| 138 | // data["legacy_last_name"] = sp.Lastname; | 138 | // data["legacy_last_name"] = sp.Lastname; |
| 139 | // data["id"] = m_agentID; | 139 | // data["id"] = m_agentID; |
| @@ -141,7 +141,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 141 | 141 | ||
| 142 | //Send back data | 142 | //Send back data |
| 143 | Hashtable responsedata = new Hashtable(); | 143 | Hashtable responsedata = new Hashtable(); |
| 144 | responsedata["int_response_code"] = 200; | 144 | responsedata["int_response_code"] = 200; |
| 145 | responsedata["content_type"] = "text/plain"; | 145 | responsedata["content_type"] = "text/plain"; |
| 146 | responsedata["keepalive"] = false; | 146 | responsedata["keepalive"] = false; |
| 147 | responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(data); | 147 | responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(data); |