aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-10-266-13/+89
|\
| * Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-261-6/+61
| * Implementation of PRIM_OMEGA, but only for settingSignpostMarv Martin2011-10-262-4/+18
| * Implementing PRIM_LINK_TARGET, but only for setting paramsSignpostMarv Martin2011-10-262-4/+14
* | Merge branch 'master' into bigmergeMelanie2011-10-2634-68/+77
|\ \ | |/
| * Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from...Justin Clark-Casey (justincc)2011-10-251-0/+2
| * Remove unused fields from CollisionEventUpdateJustin Clark-Casey (justincc)2011-10-255-28/+10
| * Get rid of the pointless null checks on collision listeners. Add warning abo...Justin Clark-Casey (justincc)2011-10-253-7/+6
| * When sending object collision updates, don't null out and recreate the Collis...Justin Clark-Casey (justincc)2011-10-252-13/+8
| * For ScenePresence collision events, instead of creating a new CollisionEvents...Justin Clark-Casey (justincc)2011-10-253-9/+17
| * Fix bug where collision event listeners were not removed once the listener ha...Justin Clark-Casey (justincc)2011-10-251-4/+5
| * minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it'...Justin Clark-Casey (justincc)2011-10-251-4/+4
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-2526-4/+26
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-252-4/+22
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollS...Justin Clark-Casey (justincc)2011-10-242-4/+22
* | Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmergeMelanie2011-10-251-8/+14
|\ \ | |/
| * separate out future common setup code from EventQueueTests.AddForClient()Justin Clark-Casey (justincc)2011-10-241-8/+14
* | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-253-2/+75
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client registe...Justin Clark-Casey (justincc)2011-10-243-2/+75
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-251-1/+10
|\ \ | |/
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-241-1/+10
* | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * Comment out the uuid gatherer lines that I accidentally left in.Justin Clark-Casey (justincc)2011-10-231-4/+4
* | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmergeMelanie2011-10-251-0/+1
|\ \ | |/
| * Fix missing Busy-Mode ResponsePixel Tomsen2011-10-221-0/+1
* | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Add case to Lightshare/WindlightBlueWall2011-10-221-0/+3
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-252-16/+48
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-222-16/+48
* | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-252-5/+5
|\ \ | |/
| * refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss...Justin Clark-Casey (justincc)2011-10-222-5/+5
* | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmergeMelanie2011-10-251-5/+3
|\ \ | |/
| * very minor removal of old commented out line of code in OdeSceneJustin Clark-Casey (justincc)2011-10-211-5/+3
* | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmergeMelanie2011-10-251-3/+0
|\ \ | |/
| * remove unnecessary null check on _collisionEventPrimJustin Clark-Casey (justincc)2011-10-201-3/+0
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-253-25/+32
|\ \ | |/
| * Get OdeScene to use passed in time step rather than hard-coded 0.089Justin Clark-Casey (justincc)2011-10-203-25/+32
* | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmergeMelanie2011-10-251-12/+4
|\ \ | |/
| * Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless Ma...Justin Clark-Casey (justincc)2011-10-201-12/+4
* | Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmergeMelanie2011-10-252-13/+5
|\ \ | |/
| * For now, stop passing timeStep into methods where it's not actually used.Justin Clark-Casey (justincc)2011-10-202-13/+5
* | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmergeMelanie2011-10-251-2/+2
|\ \ | |/
| * Change wording on asset requests.Justin Clark-Casey (justincc)2011-10-191-2/+2
* | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmergeMelanie2011-10-251-5/+0
|\ \ | |/
| * Removed redundant NotInTransit function from ScenePresence. IsInTransit=false...Dan Lake2011-10-191-5/+0
* | Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmergeMelanie2011-10-255-318/+318
|\ \ | |/
| * Moved HaveNeighbor utility function from ScenePresence to Scene. Fixed line e...Dan Lake2011-10-195-318/+318
| * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-10-192-72/+100
| |\
* | \ Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmergeMelanie2011-10-259-344/+319
|\ \ \ | |/ /
| * | Renamed and rearranged AvatarFactoryModule to eliminate redundant lookups of ...Dan Lake2011-10-199-344/+319
generated by cgit v1.1 at 2024-08-22 19:48:23 +0000