diff options
| author | Melanie | 2010-10-06 00:27:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-06 00:27:10 +0100 |
| commit | d8149373c15d9ec39c0f836a337e58b633f45829 (patch) | |
| tree | 3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /OpenSim/Region/OptionalModules/World | |
| parent | Avoid throwing errors when adding existing meshes to the render scene (diff) | |
| parent | Remove sirikata project (diff) | |
| download | opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.zip opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2 opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index e42dbf2..7e1b5ac 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
| @@ -812,7 +812,7 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
| 812 | // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an | 812 | // gets the object data. If the data sent by the client doesn't match the object, the viewer probably has an |
| 813 | // old idea of what the object properties are. Viewer developer Hazim informed us that the base module | 813 | // old idea of what the object properties are. Viewer developer Hazim informed us that the base module |
| 814 | // didn't check the client sent data against the object do any. Since the base modules are the | 814 | // didn't check the client sent data against the object do any. Since the base modules are the |
| 815 | // 'crowning glory' examples of good practice.. | 815 | // 'crowning glory' examples of good practice.. |
| 816 | 816 | ||
| 817 | // Validate that the object exists in the scene the user is in | 817 | // Validate that the object exists in the scene the user is in |
| 818 | SceneObjectPart part = s.GetSceneObjectPart(localID); | 818 | SceneObjectPart part = s.GetSceneObjectPart(localID); |