aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-07-2935-405/+836
|\
| * Same issue.Diva Canto2013-07-281-0/+1
| * Same issue as previous commit.Diva Canto2013-07-282-14/+17
| * Fix an issue where HG members of groups weren't seeing the entire membership ...Diva Canto2013-07-281-2/+20
| * Removed commented lines and useless debug messageDiva Canto2013-07-282-17/+0
| * Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that ...Diva Canto2013-07-285-76/+212
| * This makes people search work.Diva Canto2013-07-281-0/+41
| * This makes group search work (Groups V2).Diva Canto2013-07-286-2/+88
| * More on group chat: only root agents should subscribe to OnInstantMessage, or...Diva Canto2013-07-271-1/+14
| * More bug fixes on group chatDiva Canto2013-07-271-15/+19
| * Several major improvements to group (V2) chat. Specifically: handle join/drop...Diva Canto2013-07-2711-196/+316
| * Increased the rate of the PollServiceRequestManager to 0.5 secs (it was 1sec)...Diva Canto2013-07-261-1/+1
| * Trying to decrease the lag on group chat. (Groups V2 only)Diva Canto2013-07-261-16/+24
| * Commented out ChatSessionRequest capability in Vivox and Freeswitch. We aren'...Diva Canto2013-07-262-18/+18
| * Fix regression from 056a6ee7 because the RemoteSimulationConnector uses a cop...Justin Clark-Casey (justincc)2013-07-261-2/+5
| * Fix failure in TestCreateDuplicateRootScenePresence().Justin Clark-Casey (justincc)2013-07-261-0/+13
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-261-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimnebadon2013-07-263-2/+5
| | |\
| | * | Force map tiler to save Water.jpg as an actual jpeg format it seems even thou...nebadon2013-07-261-1/+1
| * | | Fix regression tests relating to agent transfer by making simulator use last ...Justin Clark-Casey (justincc)2013-07-265-6/+39
| | |/ | |/|
| * | Fix NPC regression test failures.Justin Clark-Casey (justincc)2013-07-263-2/+5
| |/
| * Comment debug messageDiva Canto2013-07-261-2/+2
| * Slight improvement: no need to delay the removal of the queues in EQ, because...Diva Canto2013-07-261-8/+0
| * This should fix all issues with teleports. One should be able to TP as fast a...Diva Canto2013-07-254-87/+54
| * Return Simulator/0.1 (V1) entity transfer behaviour to waiting only 2 seconds...Justin Clark-Casey (justincc)2013-07-261-7/+7
| * Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotCl...Justin Clark-Casey (justincc)2013-07-263-4/+6
| * If a returning teleport starts to reuse a downgraded child connection that wa...Justin Clark-Casey (justincc)2013-07-263-12/+34
| * Increased the wait time to 15 secs. In a 0.7.5 standalone where the effect wa...Diva Canto2013-07-241-2/+2
* | Merge branch 'master' into careminsterMelanie2013-07-258-85/+351
|\ \ | |/
| * Deleted all [ZZZ] debug messages.Diva Canto2013-07-242-6/+0
| * The previous commit did fix the infinity problem! I'm putting the same time o...Diva Canto2013-07-241-7/+13
| * Today's wild shot at the infinity problem. Wait on the child agent left behind.Diva Canto2013-07-241-1/+3
| * Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that...Diva Canto2013-07-241-7/+2
| * One more thing to test in order to let CompleteMovement go up the stack.Diva Canto2013-07-241-2/+3
| * Minor adjustment on timings of waits.Diva Canto2013-07-242-6/+21
| * Changed the RegionHandshake packet to the Unknown queue, so that it is sent w...Diva Canto2013-07-241-1/+1
| * This commit message intentionally left blank (last commit was idiotic)Diva Canto2013-07-241-1/+2
| * Improve the opening test in CompleteMovement, to account for multiple flags b...Diva Canto2013-07-241-1/+1
| * More on putting TP V1 as it wasDiva Canto2013-07-241-16/+16
| * Minor improvements on TP V1 trying to make it exactly as it was before.Diva Canto2013-07-241-15/+17
| * New Teleport protocol (V2), still compatible with V1 and older. (version of t...Diva Canto2013-07-246-79/+316
| * Further tweaks on TPs: not sending the callback URL and instead waiting 15sec...Diva Canto2013-07-243-28/+35
| * EXPERIMENTAL: yet another variation of ES/EAC/TPFinishDiva Canto2013-07-241-39/+39
| * Amend previous commit.Diva Canto2013-07-241-4/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-242-3/+4
| |\
| * | Added config var that we all thought was already there: see_into_region. (Not...Diva Canto2013-07-241-34/+45
| * | Decreased the time of group cache to 1 min, because it was getting on my nerv...Diva Canto2013-07-241-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-07-2431-247/+910
|\ \ \ | | |/ | |/|
| * | For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what...Justin Clark-Casey (justincc)2013-07-231-2/+2
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-235-21/+50
| |\ \ | | |/