Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | First stage of the new interactive region creation. This will allow creation | Melanie | 2010-03-23 | 6 | -48/+302 | |
| | | | | | | | 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. | |||||
* | Somehow the starting estate number in MySQL was lost. This adds a migration | Melanie | 2010-03-22 | 1 | -0/+3 | |
| | | | | | | | | 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 | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-03-22 | 1 | -1/+1 | |
|\ | ||||||
| * | * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ↵ | John Hurliman | 2010-03-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll * Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate() | |||||
* | | Remove the reading of estate_settings.xml and the associated processing of | Melanie | 2010-03-22 | 7 | -253/+30 | |
|/ | | | | | defaults. Adding code to facilitate estate creation / managemment as part of first time start up | |||||
* | Fix a nullref in permissions when returning objects via right-click | Melanie | 2010-03-20 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-19 | 6 | -102/+112 | |
|\ | ||||||
| * | Flesh out the new permission method | Melanie | 2010-03-18 | 1 | -4/+95 | |
| | | ||||||
| * | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 6 | -102/+21 | |
| | | | | | | | | really don't need two methods doing the same thing, but differently. | |||||
* | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 22 | -41/+41 | |
| | | | | | | | | 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. | |||||
* | | Cleaned up access to scenepresences in scenegraph. GetScenePresences and ↵ | Dan Lake | 2010-03-19 | 22 | -501/+366 | |
|/ | | | | 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>). | |||||
* | Inconsistent locking of ScenePresence array in SceneGraph. Fixed by ↵ | Dan Lake | 2010-03-17 | 10 | -233/+258 | |
| | | | | | | 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. | |||||
* | minor logging changes to BaseHttpServer, OSHttpRequest | Justin Clark-Casey (justincc) | 2010-03-16 | 2 | -30/+58 | |
| | ||||||
* | Removed the unused use_async_when_possible config variable | John Hurliman | 2010-03-16 | 3 | -19/+2 | |
| | ||||||
* | Fixed several unhandled exceptions and performance issues with ↵ | John Hurliman | 2010-03-16 | 5 | -54/+66 | |
| | | | | 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 | |||||
* | * Fixing the SimianGrid friend connector enabled detection since the friends ↵ | John Hurliman | 2010-03-16 | 1 | -1/+9 | |
| | | | | module uses a different pattern in the .ini file | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-15 | 6 | -2/+32 | |
|\ | ||||||
| * | Get the local inner simulation service object to the handler so that there ↵ | Diva Canto | 2010-03-15 | 5 | -0/+17 | |
| | | | | | | | | is no possibility of cascading requests when failures happen. | |||||
| * | Restoring LoadPlugin as it was before. Justin's last change made it throw. | Diva Canto | 2010-03-15 | 3 | -2848/+2861 | |
| | | ||||||
* | | Fixing line endings | John Hurliman | 2010-03-15 | 2 | -2846/+2846 | |
| | | ||||||
* | | * Fixed a bug in Simian.IsSimianEnabled (since the default module strings ↵ | John Hurliman | 2010-03-15 | 1 | -1/+1 | |
|/ | | | | follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector) | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-15 | 10 | -2927/+2966 | |
|\ | ||||||
| * | flip UVs for profile faces | dahlia | 2010-03-13 | 1 | -1/+1 | |
| | | ||||||
| * | add a null check in ScenePresence constructor | dahlia | 2010-03-13 | 1 | -1/+2 | |
| | | ||||||
| * | correct some references which could produce erroneous prim face numbers | dahlia | 2010-03-12 | 1 | -2202/+2201 | |
| | | ||||||
| * | some improvements to sculptmap alpha handling and LOD | dahlia | 2010-03-12 | 1 | -627/+645 | |
| | | ||||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-03-12 | 2 | -6/+5 | |
| | | ||||||
| * | refactor: Move another RezSingleAttachment() from Scene.Inventory to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 5 | -37/+57 | |
| | | | | | | | | AttachmentsModule | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 15 | -163/+363 | |
| |\ | ||||||
| * | | refactor: move RezSingleAttachmentFromInventory() from SceneGraph to ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 5 | -58/+60 | |
| | | | | | | | | | | | | AttachmentsModule | |||||
* | | | Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors | John Hurliman | 2010-03-15 | 10 | -12/+12 | |
| | | | ||||||
* | | | * UuidGatherer now tracks asset types for assets it discovers. The asset ↵ | John Hurliman | 2010-03-15 | 7 | -33/+47 | |
| |/ |/| | | | | | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-12 | 5 | -44/+56 | |
|\ \ | |/ | ||||||
| * | refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule | Justin Clark-Casey (justincc) | 2010-03-12 | 4 | -44/+53 | |
| | | ||||||
| * | start laoding griduser local connector, though it isn't invoked by anything yet | Justin Clark-Casey (justincc) | 2010-03-12 | 1 | -0/+3 | |
| | | ||||||
* | | Minor tweak to clean up SimianGrid asset service URLs | John Hurliman | 2010-03-12 | 1 | -1/+1 | |
| | | ||||||
* | | * Added a better check to the SimianGrid connectors to test if they are ↵ | John Hurliman | 2010-03-12 | 15 | -163/+363 | |
|/ | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET | |||||
* | Fixing the previous patch to work correctly with standalone mode | John Hurliman | 2010-03-12 | 9 | -36/+36 | |
| | ||||||
* | Fixed SimianGrid connectors to gracefully exit if the required config ↵ | John Hurliman | 2010-03-12 | 9 | -56/+63 | |
| | | | | sections are missing | |||||
* | Simplify database setup and remove migration problems by moving all sqlite ↵ | Justin Clark-Casey (justincc) | 2010-03-12 | 11 | -9/+13 | |
| | | | | | | | | | 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 | |||||
* | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 11 | -0/+3667 | |
|\ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-12 | 3 | -15/+19 | |
| |\ | ||||||
| | * | Bug fix: "last location" login. | Diva Canto | 2010-03-12 | 1 | -0/+4 | |
| | | | ||||||
| * | | Adding the SimianGrid connectors | John Hurliman | 2010-03-11 | 10 | -0/+3663 | |
| | | | ||||||
* | | | Fix tests broken in 88771aeed3d45e60a18aa9a810eeb37b8e5def12 | Justin Clark-Casey (justincc) | 2010-03-12 | 7 | -54/+120 | |
| | | | | | | | | | | | | | | | | | | 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 | |||||
* | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-12 | 57 | -150/+773 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Changed some properties and methods from private to protected in ↵ | Mikko Pallari | 2010-03-11 | 2 | -15/+15 | |
| |/ | | | | | | | LLLoginResponse and LLLoginService so they could be inherited better. | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-10 | 56 | -126/+749 | |
| |\ | ||||||
| | * | Reintroduce a check that was dropped from permissions | Melanie | 2010-03-10 | 1 | -1/+1 | |
| | | | ||||||
| | * | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 40 | -79/+349 | |
| | | |