diff options
| author | Justin Clark-Casey (justincc) | 2010-11-17 01:28:46 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-11-17 01:28:46 +0000 |
| commit | b38a1594c1028ed39def8079043ae19ebc28b813 (patch) | |
| tree | 962ee7f2584dead0ffa37cf1c8b3535a3626a26b /OpenSim/Server | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| parent | Prevent leftover attachments from clogging up the pipes (diff) | |
| download | opensim-SC_OLD-b38a1594c1028ed39def8079043ae19ebc28b813.zip opensim-SC_OLD-b38a1594c1028ed39def8079043ae19ebc28b813.tar.gz opensim-SC_OLD-b38a1594c1028ed39def8079043ae19ebc28b813.tar.bz2 opensim-SC_OLD-b38a1594c1028ed39def8079043ae19ebc28b813.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
| -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 | } |