aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/EntityTransfer (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-072-113/+10
|\
| * Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAc...Diva Canto2012-04-062-147/+10
| * Deleted the unused and commented code from 2 commits ago.Diva Canto2012-04-061-241/+1
| * WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose...Diva Canto2012-04-061-21/+295
* | Merge branch 'master' into careminsterMelanie2012-04-031-2/+4
|\ \ | |/
| * Eliminate race condition where many callers would check SOP.PhysicsActor != n...Justin Clark-Casey (justincc)2012-04-031-4/+4
* | Merge branch 'master' into careminsterMelanie2012-03-291-7/+62
|\ \ | |/
| * HG 2.0 Suitcase inventory: proof of concept now working properly with the hea...Diva Canto2012-03-281-10/+11
| * HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hac...Diva Canto2012-03-281-7/+61
* | Merge branch 'master' into careminsterMelanie2012-03-281-10/+44
|\ \ | |/
| * HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarde...Diva Canto2012-03-271-10/+44
* | Merge branch 'master' into careminsterMelanie2012-03-271-0/+15
|\ \ | |/
| * User level based restrictions for HyperGrid teleports, asset uploads, group c...Snoopy Pfeffer2012-03-271-0/+15
* | Merge branch 'master' into careminsterMelanie2012-03-272-3/+29
|\ \ | |/
| * HG: beginning of a more restrictive inventory access procedure (optional). Ex...Diva Canto2012-03-272-3/+29
* | Merge branch 'master' into careminsterMelanie2012-03-141-0/+13
|\ \ | |/
| * Teleports: bounce off repeated requests of teleporting the same agent. Some s...Diva Canto2012-03-131-0/+13
* | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-261-0/+6
* | Merge branch 'master' into careminsterMelanie2012-02-231-8/+5
|\ \ | |/
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-5/+4
* | Merge branch 'master' into careminsterMelanie2012-02-201-1/+3
|\ \ | |/
| * One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-5/+8
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-5/+8
| |\ \ | | |/
| | * A few more tweaks on position updates and create child agents. Mono hates con...Diva Canto2012-02-191-4/+8
* | | try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-151-15/+18
|/ /
* | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-141-102/+38
* | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-5/+5
* | Merge branch 'master' into careminsterMelanie2012-02-011-1/+1
|\ \ | |/
| * HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri...Diva Canto2012-01-311-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-291-2/+1
|\ \ | |/
| * Send CHANGED_TELEPORT during local TP again - partially revert cf73afec356eed...Bo Iwu2012-01-281-2/+1
* | Adapt a cast to using the new TeleportFlagsMelanie2012-01-111-1/+1
* | Merge branch 'master' into careminsterMelanie2012-01-021-5/+7
|\ \ | |/
| * Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region...Diva Canto2011-12-291-3/+4
| * HG: more adjustments for making HG Simian work. Added server_uri as new key o...Diva Canto2011-12-291-2/+3
* | Merge branch 'master' into careminsterMelanie2011-12-241-10/+0
|\ \ | |/
| * remove the old region crossing handlerMic Bowman2011-12-231-10/+0
* | Merge branch 'master' into careminsterMelanie2011-12-231-0/+24
|\ \ | |/
| * Fixes some problems with objects that attempt to cross a region boundaryMic Bowman2011-12-221-0/+24
* | Merge branch 'master' into careminsterMelanie2011-12-221-39/+32
|\ \ | |/
| * Region crossings redone: (1) removed WaitForCallback. Now that we are passing...Diva Canto2011-12-221-39/+32
* | Merge branch 'master' into careminsterMelanie2011-12-182-2/+16
|\ \ | |/
| * Sends the consistent child agent position upon creation of the child agent in...Diva Canto2011-12-161-1/+12
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-1/+4
* | Merge branch 'master' into bigmergeMelanie2011-12-051-99/+104
|\ \ | |/
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-031-1/+0
| * Stop some places where we're trying to reset animations in child agents where...Justin Clark-Casey (justincc)2011-12-021-100/+110
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+1
|\ \ | |/
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-1/+1