aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-231-11/+38
|\
| * Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-222-19/+43
| * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-5/+8
| * * more url / hg cleanupJonathan Freedman2010-10-111-24/+10
| * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-101-1/+4
| |\
| * \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-071-5/+26
| |\ \
| * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-5/+17
| |\ \ \
| * | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-021-20/+7
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-211-38/+11
|\ \ \ \ \
| * | | | | * more url / hg cleanupJonathan Freedman2010-10-201-24/+10
| * | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-201-20/+7
| | |_|_|/ | |/| | |
| * | | | Fix an infinite recursionMelanie2010-10-081-1/+4
| | |_|/ | |/| |
| * | | Plumb the path for multiple object deletesMelanie2010-10-061-5/+26
| | |/ | |/|
* | | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-1/+1
* | | Implement rezzing coalesced objectsMelanie2010-10-071-136/+182
* | | Implement taking of coalesced objects.Melanie2010-10-071-200/+263
* | | Plumb the path for multiple object deletesMelanie2010-10-061-5/+26
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-5/+17
|\ \ \ | |/ /
| * | Added viewer's channel, mac, and id0 to agent circuit data. Also moved client...Diva Canto2010-10-031-5/+17
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-7/+4
|\ \ | |/
| * Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA...John Hurliman2010-09-161-6/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-134-18/+18
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-09-124-18/+18
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-053-8/+8
|\ \ | |/
| * Move code that allows llGiveInvetory() to move item into appropriate system f...Justin Clark-Casey (justincc)2010-09-041-1/+1
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2010-09-032-7/+7
| * Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-311-1/+1
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie Thielker2010-08-312-12/+23
|\ \
| * \ Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...meta72010-08-304-120/+35
| |\ \
| * | | Kick the user from the region in the circumstance that the TP home failed - O...meta72010-08-302-12/+23
* | | | Adjust the "Magic numbers" we use because we can't reference the actualMelanie Thielker2010-08-311-1/+1
| |/ / |/| |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-303-118/+29
|\ \ \ | | |/ | |/|
| * | Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-302-118/+20
| * | Addresses mantis #4991 -- HG between two regions with the same map coordinate...Diva Canto2010-08-271-0/+9
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-2/+4
|\ \ \ | |/ /
| * | Improve consistency of locking for SOG.m_parts in order to avoid race conditi...Justin Clark-Casey (justincc)2010-08-261-2/+4
* | | Call attachment cleanup when an agent crosses outMelanie Thielker2010-08-241-0/+2
| |/ |/|
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-188-45/+230
|\ \ | |/
| * * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() t...John Hurliman2010-08-171-1/+1
| * Attempt at sending TeleportProgress, but it doesn't seem to be doing anything...Diva Canto2010-08-161-0/+3
| * Work on TeleportStart: renamed method from TeleportLocationStart to TeleportS...Diva Canto2010-08-161-6/+4
| * Better comment (related to previous commit)Diva Canto2010-08-151-1/+1
| * Addresses mantis #4929. Agent was being logged off the grid too soon -- thing...Diva Canto2010-08-152-6/+23
| * In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from li...Justin Clark-Casey (justincc)2010-08-141-6/+4
| * minor: remove mono compiler warningsJustin Clark-Casey (justincc)2010-08-134-24/+24
| * refactor: move binary statistics logging from scene into separate region moduleJustin Clark-Casey (justincc)2010-08-131-0/+169
| * refactor: Use SOP.Flags rather than SOP.ObjectFlagsJustin Clark-Casey (justincc)2010-08-131-2/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-061-4/+4
|\ \ | |/
| * Merge branch 'iar-merge'Justin Clark-Casey (justincc)2010-08-041-4/+4
| |\
| | * Add --merge switch to load iar.Justin Clark-Casey (justincc)2010-06-301-4/+4