Commit Graph

12558 Commits (881fcb7def0ef1ff81c6de10137abcdca8bc7679)

Author SHA1 Message Date
Melanie 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
John Hurliman 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
Melanie f020bd3206 Fix a nullref in permissions when returning objects via right-click 2010-03-20 15:49:39 +00:00
Kitto Flora 0f5fb6f190 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-03-19 19:14:09 -04:00
Kitto Flora add47befac Update acceleration to 0 on no tphysical. 2010-03-19 18:53:16 -04:00
John Hurliman 5e65bef805 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-19 15:17:15 -07:00
Dan Lake 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
Dan Lake 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
Kitto Flora 0e36994fe7 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-03-19 13:27:12 -04:00
Kitto Flora 3ea72eeabb Fix sit with autopilot. 2010-03-19 13:26:34 -04:00
Melanie 4c2a51b1b5 Merge branch 'master' into careminster-presence-refactor 2010-03-18 20:09:04 +00:00
Melanie 46d990419b Merge branch 'careminster' into careminster-presence-refactor 2010-03-18 20:00:58 +00:00
Melanie e0289bb432 Flesh out the new permission method 2010-03-18 19:58:21 +00:00
Melanie 69b5ddceda 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:58:56 +00:00
Melanie 1a2cbbc8c1 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2010-03-18 18:58:44 +00:00
Melanie f35eb8819c 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:58:37 +00:00
Melanie 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
Dan Lake 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
Kitto Flora 6df969894c Fix AbsolutePosition for autopilot/sit. 2010-03-17 13:30:48 -04:00
Thomas Grimshaw e442c2a3f9 Prevent llTeleportAgentHome from affecting gods 2010-03-17 17:42:33 +01:00
Justin Clark-Casey (justincc) a647f50087 minor logging changes to BaseHttpServer, OSHttpRequest 2010-03-16 22:58:12 +00:00
John Hurliman b51f40da8f Removed the unused use_async_when_possible config variable 2010-03-16 12:03:04 -07:00
John Hurliman 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
John Hurliman 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
Thomas Grimshaw 37815f3402 Debugger tags for VS2010 2010-03-16 18:13:00 +01:00
John Hurliman 28e4302eb6 Fixed a bad module name in SimianGrid.ini 2010-03-15 22:07:28 -07:00
John Hurliman 3be2b592b2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-15 20:54:57 -07:00
John Hurliman 65c1fbc14d Fixing line endings 2010-03-15 20:54:48 -07:00
John Hurliman 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
Diva Canto 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
Diva Canto 76106e39d9 Restoring LoadPlugin as it was before. Justin's last change made it throw. 2010-03-15 19:34:14 -07:00
John Hurliman 4e180e84e2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-15 15:38:55 -07:00
John Hurliman 84459d2bc2 Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors 2010-03-15 15:38:29 -07:00
John Hurliman 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
Melanie a1cd3b5b88 Change GodLevel to UserLevel so gods can teleport freely without having
to enter god mode first
2010-03-15 17:54:39 +00:00
Melanie d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +00:00
Melanie 898fa637c3 Merge branch 'careminster' into careminster-presence-refactor 2010-03-15 17:12:08 +00:00
Kitto Flora 8cbd0d3b5f Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2010-03-14 16:23:12 -04:00
Kitto Flora 8198062610 RotLookAt repaired; debug msg cleanup. 2010-03-14 16:22:13 -04:00
dahlia 1e73e16fd0 flip UVs for profile faces 2010-03-13 18:41:36 -08:00
dahlia 2ebc4be99d add a null check in ScenePresence constructor 2010-03-13 12:04:49 -08:00
CasperW 80e4068b3e Fix the delay in llGiveInventory so that it only takes effect when giving inventory to an avatar (this now replicates SL behaviour) 2010-03-13 15:13:19 +01:00
dahlia 41a98b902b correct some references which could produce erroneous prim face numbers 2010-03-12 22:05:22 -08:00
dahlia 1d14cf8c3f some improvements to sculptmap alpha handling and LOD 2010-03-12 21:21:28 -08:00
Justin Clark-Casey (justincc) 4b81393274 minor: remove some mono compiler warnings 2010-03-12 23:21:45 +00:00
Justin Clark-Casey (justincc) 315fa06c75 refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule 2010-03-12 23:20:38 +00:00
Justin Clark-Casey (justincc) 6828d8ecbe Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-12 22:49:16 +00:00
Justin Clark-Casey (justincc) 582375509c refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule 2010-03-12 22:48:49 +00:00
John Hurliman 5beb08be31 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-12 14:40:21 -08:00
John Hurliman 3ea9fdea8b Minor tweak to clean up SimianGrid asset service URLs 2010-03-12 14:39:51 -08:00