diff options
| author | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
|---|---|---|
| committer | Jonathan Freedman | 2010-11-21 20:01:48 -0800 |
| commit | b7f5e8284360f92e0e102b9546076573c57d9397 (patch) | |
| tree | 132663da8c1882e524241b55a739ef2758ef8958 /OpenSim/Server/Handlers/Simulation | |
| parent | Merge https://github.com/opensim/opensim into mantis5110 (diff) | |
| parent | Merge branch 'master' of /var/git/opensim/ (diff) | |
| download | opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.zip opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.gz opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.bz2 opensim-SC_OLD-b7f5e8284360f92e0e102b9546076573c57d9397.tar.xz | |
Merge branch 'master-core' into mantis5110
Diffstat (limited to 'OpenSim/Server/Handlers/Simulation')
| -rw-r--r-- | OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs index 33e5aa6..04ff83f 100644 --- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs +++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs | |||
| @@ -162,6 +162,11 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 162 | return; | 162 | return; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | if (args.ContainsKey("modified")) | ||
| 166 | sog.HasGroupChanged = args["modified"].AsBoolean(); | ||
| 167 | else | ||
| 168 | sog.HasGroupChanged = false; | ||
| 169 | |||
| 165 | if ((args["state"] != null) && s.AllowScriptCrossings) | 170 | if ((args["state"] != null) && s.AllowScriptCrossings) |
| 166 | { | 171 | { |
| 167 | stateXmlStr = args["state"].AsString(); | 172 | stateXmlStr = args["state"].AsString(); |
| @@ -243,4 +248,4 @@ namespace OpenSim.Server.Handlers.Simulation | |||
| 243 | } | 248 | } |
| 244 | 249 | ||
| 245 | } | 250 | } |
| 246 | } \ No newline at end of file | 251 | } |