diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/Framework/Library | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/Library')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs index 862f0b7..df9d4f9 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs | |||
@@ -126,7 +126,7 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
126 | return; | 126 | return; |
127 | 127 | ||
128 | // This will never run more than once, even if the region is restarted | 128 | // This will never run more than once, even if the region is restarted |
129 | if (!m_HasRunOnce) | 129 | if (!m_HasRunOnce) |
130 | { | 130 | { |
131 | LoadLibrariesFromArchives(); | 131 | LoadLibrariesFromArchives(); |
132 | //DumpLibrary(); | 132 | //DumpLibrary(); |
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs index 21e00b2..c1a9457 100644 --- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs +++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs | |||
@@ -259,11 +259,11 @@ namespace OpenSim.Region.CoreModules.Framework.Library | |||
259 | 259 | ||
260 | /// <summary> | 260 | /// <summary> |
261 | /// Get the union of permissions of all inventory items | 261 | /// Get the union of permissions of all inventory items |
262 | /// that hold the given assetID. | 262 | /// that hold the given assetID. |
263 | /// </summary> | 263 | /// </summary> |
264 | /// <param name="userID"></param> | 264 | /// <param name="userID"></param> |
265 | /// <param name="assetID"></param> | 265 | /// <param name="assetID"></param> |
266 | /// <returns>The permissions or 0 if no such asset is found in | 266 | /// <returns>The permissions or 0 if no such asset is found in |
267 | /// the user's inventory</returns> | 267 | /// the user's inventory</returns> |
268 | public int GetAssetPermissions(UUID userID, UUID assetID) { return 0; } | 268 | public int GetAssetPermissions(UUID userID, UUID assetID) { return 0; } |
269 | } | 269 | } |