Commit Graph

12028 Commits (24ca202daba21d032d17e933e93960b534765bee)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 24ca202dab Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-26 19:57:11 +00:00
Justin Clark-Casey (justincc) bcac984f5d fix nant related build break 2010-03-26 19:56:53 +00:00
John Hurliman a6e14165fd Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-26 12:39:36 -07:00
John Hurliman 05123c6bd5 * Fixed a dictionary value retrieval in GroupsModule 2010-03-26 12:39:22 -07:00
Justin Clark-Casey (justincc) fc2b137581 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-26 19:34:49 +00:00
Justin Clark-Casey (justincc) 9d747cb53b comment out very probably unused dist and distdir nant targets 2010-03-26 19:33:19 +00:00
John Hurliman 3e8cb7a9a0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-26 12:21:24 -07:00
John Hurliman 5a2315c68c * Fixed a bug with null value handling in WebUtil.BuildQueryString()
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
Justin Clark-Casey (justincc) 4565e5dfbc change trunk version to 0.7.Dev 2010-03-26 18:56:05 +00:00
John Hurliman dd1c1b3bcd Fixed a backwards null check that was preventing estate owner from being set and a misleading error message (in grid mode it tries to get a user, not create one) 2010-03-26 11:08:14 -07:00
Justin Clark-Casey (justincc) 87fe96ae2c replace recent IModule.GetGroup() with better GetGroupRecord(string name) 2010-03-26 00:10:29 +00:00
Justin Clark-Casey (justincc) 857918d3b0 minor: some debugging information and spacing changes to group module 2010-03-25 23:53:05 +00:00
Justin Clark-Casey (justincc) f0703cad2c add get group by name method to IGroupsModule 2010-03-25 22:47:52 +00:00
Justin Clark-Casey (justincc) 19c659ca99 fix unit tests broken by commit dcf18689b9
can't prompt for estate owner in unit tests
2010-03-25 21:46:23 +00:00
Justin Clark-Casey (justincc) bfbf25c542 minor: Print out port that http servers are using
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
Justin Clark-Casey (justincc) 6ad85dc259 put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
Melanie 3fb73e4e26 UNTESTED SQLite code to enable estate setup in interactive confguration 2010-03-23 02:18:55 +00:00
Melanie dcf18689b9 First stage of the new interactive region creation. This will allow creation
of a region and joining it to an existing estate or creating a new estate,
as well as creating an estate owner if in standalone, and assigning estate
owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as
I can't develop or test for either SQLite or MSSQL.
2010-03-23 02:05:56 +00:00
Melanie 07a6b37001 Somehow the starting estate number in MySQL was lost. This adds a migration
to start estates at 100. Existing databases having autcreated estates below
100 will see a gap in estate numbering. Other database implementors need to
ensure that no estates with numbers less that 100 are autocreated, unless
they are prepared to deal with the viewer's built-in notions of
Linden Mainland
2010-03-22 20:38:27 +00:00
Melanie d378c758e1 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-22 18:51:07 +00:00
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
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
Melanie e0289bb432 Flesh out the new permission method 2010-03-18 19:58:21 +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
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
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
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
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