aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Prevent objects rezzed in sim from being seen as attachments and becoming une...Melanie2012-04-171-0/+2
* Merge branch 'master' into careminsterMelanie2012-04-074-120/+163
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-061-4/+4
| |\
| | * Rather than having a FromFolderID property on every single prim and only ever...Justin Clark-Casey (justincc)2012-04-071-3/+3
| | * Store FromItemID for attachments once on SOG instead of on every SOP and only...Justin Clark-Casey (justincc)2012-04-071-1/+1
| * | Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAc...Diva Canto2012-04-063-150/+159
| |/
| * 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-311-0/+24
|\ \ | |/
| * minor: small message adjustment and unnecessary code elimination when notifyi...Justin Clark-Casey (justincc)2012-03-311-1/+1
| * fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932PixelTomsen2012-03-311-0/+5
* | 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-282-10/+73
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-271-0/+29
| |\
| | * Add "friends show cache <first-name> <last-name>" command for debugging purpo...Justin Clark-Casey (justincc)2012-03-281-0/+29
| * | 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-212-42/+81
|\ \ | |/
| * HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-202-42/+54
| * Added GetUUID(first, last) on UserAgentsService so that we can finally make d...Diva Canto2012-03-172-7/+34
* | Merge branch 'master' into careminsterMelanie2012-03-182-33/+240
|\ \ | |/
| * Amend to previous commit: normalize strings ToLower.Diva Canto2012-03-171-2/+6
| * More on HG access control. This commit splits the UserManagementModule into t...Diva Canto2012-03-172-40/+181
| * Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ...Diva Canto2012-03-171-0/+62
* | 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
| * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
| * More on the freeze on HG inventory transfers: spawn a threadlet on the funct...Diva Canto2012-03-081-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-083-4/+5
|\ \ | |/
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-083-4/+5
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-042-0/+12
|\ \
| * | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-261-0/+6
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-3/+3
| * | Zero force and torque on take so that items don't run away when rezzedMelanie2012-02-261-0/+2
| * | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-261-0/+4
* | | Merge branch 'master' into careminsterMelanie2012-03-031-1/+1
|\ \ \ | |/ / |/| / | |/
| * HG: Remove async in posting assets to foreign grid. Mono hates concurrency th...Diva Canto2012-02-251-1/+1
* | 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
| |\ \ | | |/