aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-03-3069-1017/+1094
|\
| * minor: commented out code removalJustin Clark-Casey (justincc)2010-03-301-1/+0
| * Completely prevent full update packets being sent after kill object packetsJustin Clark-Casey (justincc)2010-03-301-6/+43
| * fix build break. First argument of GetGroupRecord is not a uuidJustin Clark-Casey (justincc)2010-03-291-1/+1
| * Remove a redundant method bodyMelanie2010-03-291-21/+1
| * Stab one bug. When joining an estate with a new region, make sure it's alsoMelanie2010-03-281-0/+2
| * May fix mantis #4613Diva Canto2010-03-271-1/+2
| * Change the SimianGrid connector log messages to start with "[SIMIAN " to avoi...John Hurliman2010-03-269-112/+112
| * * Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This w...John Hurliman2010-03-261-8/+14
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-03-265-11/+55
| |\
| | * * Fixed a dictionary value retrieval in GroupsModuleJohn Hurliman2010-03-261-2/+3
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-261-2/+2
| | |\
| | | * change trunk version to 0.7.DevJustin Clark-Casey (justincc)2010-03-261-2/+2
| | * | * Fixed a bug with null value handling in WebUtil.BuildQueryString()John Hurliman2010-03-263-7/+50
| | |/
| * | Minor improvement on debug message.Diva Canto2010-03-261-31/+30
| * | Select Random Region if Home or Last cant be foundunknown2010-03-261-14/+34
| |/
| * Fixed a backwards null check that was preventing estate owner from being set ...John Hurliman2010-03-261-2/+2
| * replace recent IModule.GetGroup() with better GetGroupRecord(string name)Justin Clark-Casey (justincc)2010-03-265-31/+38
| * minor: some debugging information and spacing changes to group moduleJustin Clark-Casey (justincc)2010-03-254-8/+8
| * add get group by name method to IGroupsModuleJustin Clark-Casey (justincc)2010-03-253-13/+53
| * fix unit tests broken by commit dcf18689b9ab29d4ceb2348bb56fc1f77a7a8912Justin Clark-Casey (justincc)2010-03-251-1/+1
| * minor: Print out port that http servers are usingJustin Clark-Casey (justincc)2010-03-255-12/+19
| * put out full exception stack if something reaches top of base http server OnR...Justin Clark-Casey (justincc)2010-03-251-1/+1
| * UNTESTED SQLite code to enable estate setup in interactive confgurationMelanie2010-03-231-7/+45
| * First stage of the new interactive region creation. This will allow creationMelanie2010-03-236-48/+302
| * Somehow the starting estate number in MySQL was lost. This adds a migrationMelanie2010-03-221-0/+3
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-03-221-1/+1
| |\
| | * * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ...John Hurliman2010-03-201-1/+1
| * | Remove the reading of estate_settings.xml and the associated processing ofMelanie2010-03-227-253/+30
| |/
| * Fix a nullref in permissions when returning objects via right-clickMelanie2010-03-201-2/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-196-102/+112
| |\
| * | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene...Dan Lake2010-03-1922-41/+41
| * | Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetA...Dan Lake2010-03-1922-501/+366
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Kitto Flora2010-03-1951-3518/+3636
|\ \ \
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-03-1844-3226/+3419
| |\ \ \ | | | |/ | | |/|
| | * | Flesh out the new permission methodMelanie2010-03-181-4/+95
| | * | Unify a previous refactor of object return with the older solution. WeMelanie2010-03-186-102/+21
| | |/
| | * Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminati...Dan Lake2010-03-1710-233/+258
| | * minor logging changes to BaseHttpServer, OSHttpRequestJustin Clark-Casey (justincc)2010-03-162-30/+58
| | * Removed the unused use_async_when_possible config variableJohn Hurliman2010-03-163-19/+2
| | * Fixed several unhandled exceptions and performance issues with PrimitiveBaseS...John Hurliman2010-03-165-54/+66
| | * * Fixing the SimianGrid friend connector enabled detection since the friends ...John Hurliman2010-03-161-1/+9
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-156-2/+32
| | |\
| | | * Get the local inner simulation service object to the handler so that there is...Diva Canto2010-03-155-0/+17
| | | * Restoring LoadPlugin as it was before. Justin's last change made it throw.Diva Canto2010-03-153-2848/+2861
| | * | Fixing line endingsJohn Hurliman2010-03-152-2846/+2846
| | * | * Fixed a bug in Simian.IsSimianEnabled (since the default module strings fol...John Hurliman2010-03-151-1/+1
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-1510-2927/+2966
| | |\
| | * | Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectorsJohn Hurliman2010-03-1510-12/+12
| | * | * UuidGatherer now tracks asset types for assets it discovers. The asset type...John Hurliman2010-03-157-33/+47