d378c758e1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-22 18:51:07 +00:00
70b0e07d1e
Remove the reading of estate_settings.xml and the associated processing of
...
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +00:00
9a781e793a
* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
...
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
f020bd3206
Fix a nullref in permissions when returning objects via right-click
2010-03-20 15:49:39 +00:00
5e65bef805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-19 15:17:15 -07:00
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
859bc717a4
Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
2010-03-19 15:16:35 -07:00
e0289bb432
Flesh out the new permission method
2010-03-18 19:58:21 +00:00
734b0416de
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:57:29 +00:00
73e9b0be72
Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.
...
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
2010-03-17 11:21:27 -07:00
a647f50087
minor logging changes to BaseHttpServer, OSHttpRequest
2010-03-16 22:58:12 +00:00
b51f40da8f
Removed the unused use_async_when_possible config variable
2010-03-16 12:03:04 -07:00
b4dcdffb50
Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time
2010-03-16 11:50:22 -07:00
d722519b31
* Fixing the SimianGrid friend connector enabled detection since the friends module uses a different pattern in the .ini file
2010-03-16 10:40:15 -07:00
28e4302eb6
Fixed a bad module name in SimianGrid.ini
2010-03-15 22:07:28 -07:00
3be2b592b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-15 20:54:57 -07:00
65c1fbc14d
Fixing line endings
2010-03-15 20:54:48 -07:00
cffe39b95f
* Fixed a bug in Simian.IsSimianEnabled (since the default module strings follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector)
2010-03-15 20:52:41 -07:00
45ef3e9987
Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen.
2010-03-15 20:32:36 -07:00
76106e39d9
Restoring LoadPlugin as it was before. Justin's last change made it throw.
2010-03-15 19:34:14 -07:00
4e180e84e2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-15 15:38:55 -07:00
84459d2bc2
Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors
2010-03-15 15:38:29 -07:00
33f5d0d1e9
* UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context
...
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
2010-03-15 14:17:17 -07:00
1e73e16fd0
flip UVs for profile faces
2010-03-13 18:41:36 -08:00
2ebc4be99d
add a null check in ScenePresence constructor
2010-03-13 12:04:49 -08:00
41a98b902b
correct some references which could produce erroneous prim face numbers
2010-03-12 22:05:22 -08:00
1d14cf8c3f
some improvements to sculptmap alpha handling and LOD
2010-03-12 21:21:28 -08:00
4b81393274
minor: remove some mono compiler warnings
2010-03-12 23:21:45 +00:00
315fa06c75
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
2010-03-12 23:20:38 +00:00
6828d8ecbe
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 22:49:16 +00:00
582375509c
refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule
2010-03-12 22:48:49 +00:00
5beb08be31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 14:40:21 -08:00
3ea9fdea8b
Minor tweak to clean up SimianGrid asset service URLs
2010-03-12 14:39:51 -08:00
b9f5cd75bc
refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule
2010-03-12 22:39:15 +00:00
3036aba875
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
...
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
19b4770fe7
start laoding griduser local connector, though it isn't invoked by anything yet
2010-03-12 22:18:48 +00:00
9e3cdc4da5
Fixing the previous patch to work correctly with standalone mode
2010-03-12 13:28:16 -08:00
0b5141d45b
Fixed SimianGrid connectors to gracefully exit if the required config sections are missing
2010-03-12 13:16:44 -08:00
aad17e7513
Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone
...
Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
2010-03-12 20:29:17 +00:00
7d738156fa
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 20:06:40 +00:00
f2de50bb14
Fix tests broken in 88771aeed3
...
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
2010-03-12 19:31:14 +00:00
8b1e33eb2d
Fixed SimianGrid.ini to use GridCommon.ini(.example)
2010-03-12 10:31:43 -08:00
3fa4988810
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 10:19:57 -08:00
ed3288a8db
Bug fix: "last location" login.
2010-03-12 10:16:21 -08:00
db61d66e74
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 17:58:25 +00:00
2313d14acb
minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked
2010-03-11 23:33:55 +00:00
e844524b41
Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6
...
Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
2010-03-11 21:04:56 +00:00
a578feefba
very minor spacing adjustment
2010-03-11 20:20:38 +00:00
2040649871
Adding the SimianGrid connectors
2010-03-11 11:19:02 -08:00
265c24ec33
Changed some properties and methods from private to protected in LLLoginResponse and LLLoginService so they could be inherited better.
2010-03-11 07:56:44 -08:00
Melanie