aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
authoropensim mirror account2010-11-16 14:00:07 -0800
committeropensim mirror account2010-11-16 14:00:07 -0800
commit21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0 (patch)
treeb73a2aa9f04e9c34281fb38512da3eb800396769 /OpenSim/Server
parentMerge branch 'master' of /var/git/opensim/ (diff)
parentChange the way attachments are persisted. Editing a worn attachment will now (diff)
downloadopensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.zip
opensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.tar.gz
opensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.tar.bz2
opensim-SC-21b7cc5d61d9f1c83ce2daaa4a9e3142d5aa42d0.tar.xz
Merge branch 'master' of /var/git/opensim/
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs7
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}