diff options
| author | Melanie | 2012-07-12 08:55:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-12 08:55:16 +0100 |
| commit | d632fd7124e3962534fc34f9c7749615dbb62108 (patch) | |
| tree | 84ece06822680bfd5b639d9c3fd046ecbb7a154e /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Many explanitory comments added to the link and delink code in (diff) | |
| download | opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.zip opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.gz opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.bz2 opensim-SC-d632fd7124e3962534fc34f9c7749615dbb62108.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index e9db5d5..fed3122 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -11918,9 +11918,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 11918 | return; | 11918 | return; |
| 11919 | } | 11919 | } |
| 11920 | 11920 | ||
| 11921 | System.Text.UTF8Encoding enc = | 11921 | string data = Encoding.UTF8.GetString(a.Data); |
| 11922 | new System.Text.UTF8Encoding(); | ||
| 11923 | string data = enc.GetString(a.Data); | ||
| 11924 | //m_log.Debug(data); | 11922 | //m_log.Debug(data); |
| 11925 | NotecardCache.Cache(id, data); | 11923 | NotecardCache.Cache(id, data); |
| 11926 | AsyncCommands. | 11924 | AsyncCommands. |
| @@ -11973,9 +11971,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 11973 | return; | 11971 | return; |
| 11974 | } | 11972 | } |
| 11975 | 11973 | ||
| 11976 | System.Text.UTF8Encoding enc = | 11974 | string data = Encoding.UTF8.GetString(a.Data); |
| 11977 | new System.Text.UTF8Encoding(); | ||
| 11978 | string data = enc.GetString(a.Data); | ||
| 11979 | //m_log.Debug(data); | 11975 | //m_log.Debug(data); |
| 11980 | NotecardCache.Cache(id, data); | 11976 | NotecardCache.Cache(id, data); |
| 11981 | AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(), | 11977 | AsyncCommands.DataserverPlugin.DataserverReply(id.ToString(), |