aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-221-0/+151
|\
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-222-150/+150
| * Telehub Support:BlueWall2012-01-211-0/+150
* | Merge branch 'master' into careminsterMelanie2012-01-211-0/+5
|\ \ | |/
| * Telehub Support:BlueWall2012-01-201-0/+5
* | Merge branch 'master' into careminsterMelanie2012-01-161-0/+8
|\ \ | |/
| * Remove monocov and other obsolete nant build targets.Justin Clark-Casey (justincc)2012-01-161-0/+8
* | Merge branch 'master' into careminsterMelanie2012-01-132-73/+0
|\ \ | |/
| * Move some interfaces to a more apropriate placeBlueWall2012-01-122-73/+0
* | Merge branch 'master' into careminsterMelanie2012-01-121-4/+4
|\ \ | |/
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the locatio...Diva Canto2012-01-121-4/+4
* | Merge branch 'master' into careminsterMelanie2012-01-061-0/+36
|\ \ | |/
| * Adding empty ISearchModule interfaceBlueWall2012-01-051-0/+36
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+37
|\ \ | |/
| * Profile UpdatesBlueWall2012-01-031-0/+37
* | Merge branch 'master' into careminsterMelanie2011-12-202-2/+2
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-12-203-7/+21
| |\
| * | Commented a couple of verbose debug messages.Diva Canto2011-12-162-2/+2
* | | Merge branch 'master' into careminsterMelanie2011-12-191-7/+14
|\ \ \ | | |/ | |/|
| * | Migrate detailed "appearance show" report generation up to AvatarFactoryModul...Justin Clark-Casey (justincc)2011-12-191-7/+14
* | | Merge branch 'master' into careminsterMelanie2011-12-182-0/+7
|\ \ \ | |/ /
| * | Fix bug where objects could not be set to a new group if the group had been c...Justin Clark-Casey (justincc)2011-12-172-0/+7
| |/
* | Merge branch 'master' into careminsterMelanie2011-12-121-24/+55
|\ \ | |/
| * Added an option for extra settings within region ini file. Any non-hardcoded ...Dan Lake2011-12-121-20/+55
* | Merge branch 'master' into careminsterMelanie2011-12-101-0/+3
|\ \ | |/
| * Implement handler for TeleportCancel inbound packetMelanie2011-12-101-0/+3
* | Merge branch 'master' into careminsterMelanie2011-12-104-15/+9
|\ \ | |/
| * minor: comment out "unpacked appearance" log mesasge for nowJustin Clark-Casey (justincc)2011-12-091-1/+1
| * Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.Justin Clark-Casey (justincc)2011-12-091-1/+1
| * Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ...Justin Clark-Casey (justincc)2011-12-092-13/+7
* | Merge branch 'master' into bigmergeMelanie2011-12-092-19/+30
|\ \ | |/
| * Reactivate BasicCircuitTests.TestAddClient()Justin Clark-Casey (justincc)2011-12-081-16/+29
| * Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().Justin Clark-Casey (justincc)2011-12-081-3/+1
* | Merge branch 'master' into bigmergeMelanie2011-12-083-3/+81
|\ \ | |/
| * On a new client circuit, send the initial reply ack to let the client know it...Justin Clark-Casey (justincc)2011-12-083-3/+81
* | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-084-21/+9
|\ \ | |/
| * Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-071-2/+2
| * Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-073-19/+7
* | Merge branch 'master' into bigmergeMelanie2011-12-0512-15/+210
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ...Justin Clark-Casey (justincc)2011-12-0512-15/+210
* | Merge branch 'master' into bigmergeMelanie2011-12-053-51/+80
|\ \ | |/
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-032-4/+0
| * Improve locking in AgentCircuitManagerJustin Clark-Casey (justincc)2011-12-031-25/+41
| * Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionar...Justin Clark-Casey (justincc)2011-12-031-37/+54
* | Implement ChangeInventoryItemFlagsPacket handlingMelanie2011-12-041-0/+2
* | Merge branch 'master' into bigmergeMelanie2011-12-011-15/+48
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+3
| * With "debug http 1", show the path with the query string instead of just the ...Justin Clark-Casey (justincc)2011-11-291-21/+21
| * Add "debug http" command for currently simple extra debug logging of non-even...Justin Clark-Casey (justincc)2011-11-291-12/+43
* | Merge branch 'master' into bigmergeMelanie2011-11-283-59/+2
|\ \ | |/