OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
31,100 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

554 Commits (master)

Author SHA1 Message Date
UbitUmarov efd6fb05a9 code aesthetics 2018-11-17 17:05:28 +00:00
UbitUmarov 707eb8de82 remove more xml things no longer needed on .net >4.5.2 2018-01-17 07:17:24 +00:00
UbitUmarov c92ba1cc04 shut up some pesty warnings 2018-01-15 16:23:19 +00:00
UbitUmarov ec6f87d3ef disable some XmlResolver 2018-01-04 23:51:43 +00:00
UbitUmarov 04117d9f75 recover PermissionsUtil.ApplyFoldedPermissions (well my version). its use easys code readability 2017-04-29 19:07:04 +01:00
Melanie Thielker c0ce746e2d When determining if a sim can be shut down, ignore NPCs 2017-03-31 14:38:41 +01:00
Melanie Thielker 41d21190b1 Skip region restart messages and delays when there are no root agents 2017-03-31 14:38:41 +01:00
Melanie Thielker 4385d7d693 Fix errors introduced by incomplete understanding of what folded perms are 2017-01-06 13:17:43 +00:00
Melanie Thielker b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
Melanie Thielker ea8f3c83bf Finally remove the requirement for an InventoryItem/FolderBase object to 
be passed into inventory queries.
This makes the API more homogenous and also will more clearly show
coding
errors related to HG inventory where the .Owner field has a meaning
for a query but wasn't always set.
 2016-07-04 03:35:48 +01:00
Diva Canto ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
Melanie Thielker d3911606ef Move a call to RequestModuleInterface to a new scene callback function 
because the current implementation would have always returned null
 2015-11-12 20:34:09 +01:00
Diva Canto 59b63b6406 On to 0.8.3! 
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
 2015-10-18 21:51:49 -07:00
Robert Adams e5367d822b Merge of ubitworkvarnew with opensim/master as of 20150905. 
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.

Merge branch 'osmaster' into mbworknew1
 2015-09-08 04:54:16 -07:00
UbitUmarov cfcfa8f3d7 add lost admin_reset_land method 2015-09-06 21:46:30 +01:00
Diva Canto 4f208b6282 Related to previous commits: fixed namespace. 2015-09-06 09:31:35 -07:00
Diva Canto 3cf07564b6 Moved the two region loaders into the RegionLoaderPlugin dll, therefore eliminating 2 top-level dlls that didn't make much sense. 2015-09-05 17:37:07 -07:00
Diva Canto d00f73c3a4 Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework. 2015-09-04 14:39:23 -07:00
UbitUmarov 371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
UbitUmarov 3829df1059 try to implement core load oar options 2015-08-24 17:05:16 +01:00
UbitUmarov cbc569a1e0 rename ImapTileModule as IMAPImageUploadModule to match core 2015-08-24 11:06:12 +01:00
UbitUmarov 0b105da626 Merge branch 'mbworkvar2' into ubitvar 2015-08-19 08:48:50 +01:00
Melanie Thielker ce2aeb8424 Make Setup_XXX=disabled not even load the module at all, rather than 
loading and not using it
 2015-08-16 19:01:23 +02:00
Diva Canto 959872315f WARNING: massive refactor to follow libomv's latest changes regarding inventory folders. The newest version of libomv itself is committed here. Basically, everything that was using the AssetType enum has been combed through; many of those uses were changed to the new FolderType enum. 
This means that from now on, [new] root folders have code 8 (FolderType.Root), as the viewers expect, as opposed to 9, which was what we had been doing. Normal folders are as they were, -1. Also now sending folder code 100 for Suitcase folders to viewers, with no filter.
All tests pass, but fingers crossed!
 2015-08-08 12:12:50 -07:00
Diva Canto da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07:00
Robert Adams 08c72a8dc1 varregion: remove use of Constants.RegionSize is various places. 
More use of the Util routines for conversion of region handles into addresses.
 2015-03-28 07:50:04 -07:00
Melanie Thielker 5cb8127e87 Make log output of remote admin's restart region call reflect restart cancellations properly. 2015-03-23 22:16:49 +01:00
Melanie Thielker 7caff51481 Make the maptile uploader in remote admin fire and forget so the controlling host gets a timely reply. 2015-03-07 01:15:48 +01:00
Diva Canto 2138d5c7f8 Renamed VERSION_NUMBER to VersionNumber 2014-12-30 15:27:28 -08:00
Diva Canto 7466ef0525 This cleans up versioning. Specifically: 
- It establishes 4 digits for opensim versions
- It uses the same number between opensim releases and mono addins versions

It also eliminates the last addin.xml files that were still there, for consistency.
 2014-12-30 12:53:31 -08:00
Diva Canto 5cf6a6f830 WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT. 
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1
Additional changes:
- Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing.
- Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
 2014-12-30 07:58:42 -08:00
Diva Canto 89c1ac4cff Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number doesn't need to match the release version number, but I think it's a very good idea that they do. 2014-12-29 15:05:44 -08:00
Melanie Thielker 6a849e8cdf Add an XmlRpc method to get a region's root agent count. This is intended 
to let us restart grid regions when the last agent leaves.
 2014-11-21 04:42:27 +01:00
Melanie Thielker 9ce1fd7a3c Merge branch 'avination-current' 2014-08-23 19:39:31 +02:00
Melanie Thielker 1fc5dadc60 Add an admin message to refesh a region's map tile. Will be used to periodically 
rebuild the world map to clean out unused tiles.
 2014-08-23 19:38:08 +02:00
UbitUmarov 01780d4dc6 put back a check for null foldedperms 2014-08-05 19:59:21 +01:00
Justin Clark-Casey (justincc) 889194db63 Actually call Close() for shared region modules when the simulator is being shutdown. 
Adds regression test for this case.
 2014-07-02 23:49:25 +01:00
Justin Clark-Casey (justincc) 5450b1b024 Change assembly versions to 0.8.1 2014-06-17 18:37:15 +01:00
Diva Canto 77913eb679 Added a ResetLand method to RemoteAdmin, whereby all land is reset with the given parameters. 2014-06-02 08:45:39 -07:00
Diva Canto 2ff9ea3f80 Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector. 
Also added more packing/unpacking code.
 2014-06-01 10:06:26 -07:00
Oren Hurvitz 52f8669169 Stopped setting the Service URL "GatekeeperURI" on users' accounts. It isn't actually used. 2014-04-20 06:23:37 +01:00
Melanie 4ccb15290e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2014-01-28 20:47:36 +00:00
Robert Adams 6fbfb47b92 varregion: add --noterrain and --noparcel to 'load oar'. 
--noterrain suppresses the loading of the terrain from the oar.
--noparcels suppresses the loading of parcel information from the oar.
 2014-01-19 11:03:08 -08:00
Robert Adams dd6db72939 varregion: add --displacement parameter to 'load oar'. 
Adds displacment to all objects and terrain loaded from the oar.
As an example, if you have a 512x512 region and an old 256x256 oar, doing
  load oar --displacement "<128,128,0>" oarFile.oar
will load the object (and terrain) into the middle of the 512x512 region.
If displacement is not specified, 'load oar' works like it always has.
If you have a 5
 2014-01-19 10:09:43 -08:00
Robert Adams 1cf17a3cf7 Merge branch 'master' into varregion 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneBase.cs
	OpenSim/Services/Interfaces/IGridService.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
 2014-01-11 08:52:23 -08:00
Oren Hurvitz 91fd9c4670 Refactored: use a single function to apply an object's folded permissions to its main permissions 2014-01-10 19:50:03 +00:00
Robert Adams 13a9a4b653 varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. 
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
 2013-12-14 07:53:01 -08:00
Robert Adams 7aa00632b9 varregion: many replacements of in-place arithmetic with calls to 
the Util functions for converting world addresses to region addresses
and converting region handles to locations.
 2013-11-28 08:20:16 -08:00
Robert Adams 3193bcaae1 Merge branch 'master' into varregion 2013-11-24 07:23:12 -08:00
Melanie 3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00