diff options
| author | Melanie | 2013-02-07 21:26:55 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-07 21:26:55 +0000 |
| commit | 8b78b9429d049d1b18a15d3f558e241c785ae5b3 (patch) | |
| tree | 7b0c8fec3c6fbb04ab60f9402df8013333155cb3 /OpenSim/Capabilities | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Rename Bounciness to Restitution (diff) | |
| download | opensim-SC_OLD-8b78b9429d049d1b18a15d3f558e241c785ae5b3.zip opensim-SC_OLD-8b78b9429d049d1b18a15d3f558e241c785ae5b3.tar.gz opensim-SC_OLD-8b78b9429d049d1b18a15d3f558e241c785ae5b3.tar.bz2 opensim-SC_OLD-8b78b9429d049d1b18a15d3f558e241c785ae5b3.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs index 9a6ca86..11a2698 100644 --- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |||
| @@ -435,4 +435,4 @@ namespace OpenSim.Capabilities.Handlers | |||
| 435 | return llsdItem; | 435 | return llsdItem; |
| 436 | } | 436 | } |
| 437 | } | 437 | } |
| 438 | } \ No newline at end of file | 438 | } |