diff options
| author | Justin Clark-Casey (justincc) | 2011-09-10 01:09:17 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-10 01:09:17 +0100 |
| commit | 728fd0b1b8e1c80f6961ec06efb34727645fdc3e (patch) | |
| tree | 951b2b08e11a52b6c557d1ae19d2724cdb7fd329 /OpenSim/Framework | |
| parent | Add extra log information when attachments fail validation (diff) | |
| download | opensim-SC-728fd0b1b8e1c80f6961ec06efb34727645fdc3e.zip opensim-SC-728fd0b1b8e1c80f6961ec06efb34727645fdc3e.tar.gz opensim-SC-728fd0b1b8e1c80f6961ec06efb34727645fdc3e.tar.bz2 opensim-SC-728fd0b1b8e1c80f6961ec06efb34727645fdc3e.tar.xz | |
lock attachments when enumerating through them in ScenePresence.CopyTo().
May have some effect on http://opensimulator.org/mantis/view.php?id=5644
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/ChildAgentDataUpdate.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs index 53ec166..5a4811e 100644 --- a/OpenSim/Framework/ChildAgentDataUpdate.cs +++ b/OpenSim/Framework/ChildAgentDataUpdate.cs | |||
| @@ -441,7 +441,6 @@ namespace OpenSim.Framework | |||
| 441 | args["controllers"] = controls; | 441 | args["controllers"] = controls; |
| 442 | } | 442 | } |
| 443 | 443 | ||
| 444 | |||
| 445 | if ((CallbackURI != null) && (!CallbackURI.Equals(""))) | 444 | if ((CallbackURI != null) && (!CallbackURI.Equals(""))) |
| 446 | args["callback_uri"] = OSD.FromString(CallbackURI); | 445 | args["callback_uri"] = OSD.FromString(CallbackURI); |
| 447 | 446 | ||