aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-227-73/+350
|\
| * Change the key name I missed in last commitMelanie2012-01-221-1/+1
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-228-267/+273
| * Telehub Support:BlueWall2012-01-216-71/+341
* | Merge branch 'master' into careminsterMelanie2012-01-2122-46/+762
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-2011-33/+149
| |\
| | * Revert "Change linux, windows and mac ODE libraries to use the GIMPACT collid...Justin Clark-Casey (justincc)2012-01-207-0/+0
| | * Allow a viewer UDP image request retry to trigger another asset fetch if an e...Justin Clark-Casey (justincc)2012-01-192-6/+32
| | * Add image not in database test for LLImageManagerJustin Clark-Casey (justincc)2012-01-194-13/+58
| | * refactor: separate out common parts of LLImageManagerTestsJustin Clark-Casey (justincc)2012-01-191-48/+40
| | * Add LLImageManager regression test for discard caseJustin Clark-Casey (justincc)2012-01-191-0/+53
| * | Telehub Support:BlueWall2012-01-207-4/+251
| |/
| * Add "image queues clear <first-name> <last-name>" console commandJustin Clark-Casey (justincc)2012-01-192-15/+80
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-01-194-1/+64
| |\
| | * Add osGetGridHomeURI functionBlueWall2012-01-193-0/+28
| | * Change URI to lowercase to match existingBlueWall2012-01-191-1/+1
| | * Add fetching of SRV_HomeURI to "/json_grid_info"BlueWall2012-01-191-1/+36
| * | Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-197-12/+109
| |/
| * RegionReady:BlueWall2012-01-182-1/+7
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-173-1/+34
| |\
| | * Add function osGetGridCustomBlueWall2012-01-173-1/+34
| * | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-174-3/+92
| |\ \ | | |/
| | * Update osGetGrid**** functionsBlueWall2012-01-172-3/+75
| | * Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-01-172-0/+17
| | |\
| | | * Add json handler for GridInfoBlueWall2012-01-172-0/+17
| * | | Change linux, windows and mac ODE libraries to use the GIMPACT collider rathe...Justin Clark-Casey (justincc)2012-01-177-0/+0
| |/ /
* | | Add some loggingMelanie2012-01-171-0/+41
* | | Fix prim calculations so that > 32767 prims are supportedMelanie2012-01-172-3/+5
* | | Spin off NPC deletion into a thread to avoid it being done on a scriptMelanie2012-01-171-1/+3
* | | Merge branch 'master' into careminsterMelanie2012-01-160-0/+0
|\ \ \ | |/ /
| * | Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-167-2/+128
* | | Merge branch 'master' into careminsterMelanie2012-01-165-194/+24
|\ \ \ | |/ /
| * | Comment out noisy log lines I accidentally included in the nant build target ...Justin Clark-Casey (justincc)2012-01-163-8/+8
| * | Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-165-193/+20
| |/
| * protect the region ready alerts for loading oarfiles if no post URI is setMic Bowman2012-01-141-2/+5
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-167-2/+128
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-01-151-14/+24
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-01-151-14/+24
| |\ \ | | |/
| | * commented out redundant land owner checks for osTeleportAgent there isnebadon2012-01-141-14/+24
* | | Disable using an agent ID to clone NPCs. The griefing potential is too greatMelanie2012-01-151-7/+7
|/ /
* | Fix mergeMelanie2012-01-142-61/+1
* | Merge branch 'master' into careminsterMelanie2012-01-1410-117/+269
|\ \ | |/
| * Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| * Extend scripts show command to accept a single item UUID parameter to display...Justin Clark-Casey (justincc)2012-01-141-40/+47
| * Register the UrlModule for script engine events OnScriptRemoved and OnObjectR...Justin Clark-Casey (justincc)2012-01-144-13/+21
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-01-131-24/+40
| |\
| | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-01-131-24/+40
| | |\
| | | * Fix improper code formatting introduced in 6214e6a217cfBo Iwu2012-01-131-24/+40
| * | | Cleaned up the LookAt code in SOP and SOG. Added support for incrementallyMic Bowman2012-01-133-49/+34
| |/ /
| * | Fix llRotLookAt and llLookAt for non-physical objects. Per conversationMic Bowman2012-01-131-7/+23
| |/