Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | * Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This ↵ | John Hurliman | 2010-03-26 | 1 | -8/+14 | |
|/ | | | | won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up | |||||
* | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-03-26 | 6 | -28/+73 | |
|\ | ||||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -2/+3 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-26 | 1 | -15/+17 | |
| | |\ | ||||||
| | * | | * Fixed a dictionary value retrieval in GroupsModule | John Hurliman | 2010-03-26 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | fix nant related build break | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -2/+1 | |
| | |/ | |/| | ||||||
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-03-26 | 4 | -5834/+5877 | |
| |\ \ | | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-26 | 1 | -2/+2 | |
| | |\ | ||||||
| | * | | * Fixed a bug with null value handling in WebUtil.BuildQueryString() | John Hurliman | 2010-03-26 | 4 | -5834/+5877 | |
| | | | | | | | | | | | | | | | | | | | | * 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 | |||||
| * | | | comment out very probably unused dist and distdir nant targets | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -15/+17 | |
| | |/ | |/| | ||||||
| * | | change trunk version to 0.7.Dev | Justin Clark-Casey (justincc) | 2010-03-26 | 1 | -2/+2 | |
| |/ | ||||||
* | | Hippos with bin/Newtonsoft.Json.XML | Diva Canto | 2010-03-26 | 1 | -5827/+5827 | |
| | | ||||||
* | | Minor improvement on debug message. | Diva Canto | 2010-03-26 | 1 | -31/+30 | |
| | | ||||||
* | | Select Random Region if Home or Last cant be found | unknown | 2010-03-26 | 1 | -14/+34 | |
|/ | ||||||
* | Fixed a backwards null check that was preventing estate owner from being set ↵ | John Hurliman | 2010-03-26 | 1 | -2/+2 | |
| | | | | and a misleading error message (in grid mode it tries to get a user, not create one) | |||||
* | replace recent IModule.GetGroup() with better GetGroupRecord(string name) | Justin Clark-Casey (justincc) | 2010-03-26 | 5 | -31/+38 | |
| | ||||||
* | minor: some debugging information and spacing changes to group module | Justin Clark-Casey (justincc) | 2010-03-25 | 4 | -8/+8 | |
| | ||||||
* | add get group by name method to IGroupsModule | Justin Clark-Casey (justincc) | 2010-03-25 | 3 | -13/+53 | |
| | ||||||
* | fix unit tests broken by commit dcf18689b9ab29d4ceb2348bb56fc1f77a7a8912 | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -1/+1 | |
| | | | | can't prompt for estate owner in unit tests | |||||
* | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 5 | -12/+19 | |
| | | | | do this in callers so that we know who is setting up these things | |||||
* | put out full exception stack if something reaches top of base http server ↵ | Justin Clark-Casey (justincc) | 2010-03-25 | 2 | -5828/+5828 | |
| | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit | |||||
* | UNTESTED SQLite code to enable estate setup in interactive confguration | Melanie | 2010-03-23 | 1 | -7/+45 | |
| | ||||||
* | 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 | 6 | -1/+1 | |
|\ | ||||||
| * | * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ↵ | John Hurliman | 2010-03-20 | 6 | -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 | 4 | -26/+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 | |||||
* | Fixed a bad module name in SimianGrid.ini | John Hurliman | 2010-03-15 | 1 | -1/+1 | |
| | ||||||
* | 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 | |
| | |