| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly ↵ | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | passed a null node reference. Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752 | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-27 | 3 | -14/+93 | |
| | | |\ | ||||||
| | | * | | Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵ | Justin Clark-Casey (justincc) | 2011-10-27 | 3 | -1/+26 | |
| | | | | | | | | | | | | | | | | | only receive the very first collision. | |||||
| * | | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-26 | 40 | -81/+166 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 6 | -13/+89 | |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | | Added optional owner classes to existing OSSL agent Permissions | Michelle Argus | 2011-10-26 | 1 | -6/+61 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes. Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | | * | | Implementation of PRIM_OMEGA, but only for setting | SignpostMarv Martin | 2011-10-26 | 2 | -4/+18 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | | * | | Implementing PRIM_LINK_TARGET, but only for setting params | SignpostMarv Martin | 2011-10-26 | 2 | -4/+14 | |
| | | |/ | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 34 | -68/+77 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | |||||
| | | * | Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+2 | |
| | | | | | | | | | | | | | from collision events | |||||
| | | * | Remove unused fields from CollisionEventUpdate | Justin Clark-Casey (justincc) | 2011-10-25 | 5 | -28/+10 | |
| | | | | ||||||
| | | * | Get rid of the pointless null checks on collision listeners. Add warning ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 3 | -7/+6 | |
| | | | | | | | | | | | | | about synchronicity for PhysicsActor.OnCollisionUpdate event doc | |||||
| | | * | When sending object collision updates, don't null out and recreate the ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -13/+8 | |
| | | | | | | | | | | | | | CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead. | |||||
| | | * | For ScenePresence collision events, instead of creating a new ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 3 | -9/+17 | |
| | | | | | | | | | | | | | | | | | | | CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead. This assumes that the listener is using the data synchronously, which is currently the case. | |||||
| | | * | Fix bug where collision event listeners were not removed once the listener ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | had gone away. This was causing continuous use of temporary memory even when all avatars had left the scene. Memory does leak but it does cause more calls to the garbage collector, which would pause the scene thread for a very short while during collection. | |||||
| | | * | minor: rename a parameter in OdeScene.Simulate() from actor -> prim since ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -4/+4 | |
| | | | | | | | | | | | | | it's an OdePrim | |||||
| | | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 26 | -4/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo) | |||||
| * | | | Fix a missing locking call | Melanie | 2011-10-25 | 1 | -0/+1 | |
| |/ / | ||||||
| * | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 2 | -4/+22 | |
| |\ \ | |/ | ||||||
| | * | Fix bugs in EventQueueGetModule.ClientClosed() and ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -4/+22 | |
| | | | | | | | | | | | | | BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler Actually doing the tear down appear to have no ill effects with region crossing and teleport. | |||||
| * | | Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge | Melanie | 2011-10-25 | 1 | -8/+14 | |
| |\ \ | |/ | ||||||
| | * | separate out future common setup code from EventQueueTests.AddForClient() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -8/+14 | |
| | | | ||||||
| * | | Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge | Melanie | 2011-10-25 | 3 | -2/+75 | |
| |\ \ | |/ | ||||||
| | * | Add new EventQueueTests with basic test to check that adding a client ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 3 | -2/+75 | |
| | | | | | | | | | registers an http poll | |||||
| * | | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+10 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | |||||
| | * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -1/+10 | |
| | | | | | | | | | | | These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default) These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey | |||||
| * | | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge | Melanie | 2011-10-25 | 1 | -4/+4 | |
| |\ \ | |/ | ||||||
| | * | Comment out the uuid gatherer lines that I accidentally left in. | Justin Clark-Casey (justincc) | 2011-10-23 | 1 | -4/+4 | |
| | | | ||||||
| * | | Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+1 | |
| |\ \ | |/ | ||||||
| | * | Fix missing Busy-Mode Response | Pixel Tomsen | 2011-10-22 | 1 | -0/+1 | |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5748 | |||||
| * | | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+3 | |
| |\ \ | |/ | ||||||
| | * | Add case to Lightshare/Windlight | BlueWall | 2011-10-22 | 1 | -0/+3 | |
| | | | | | | | | | Thanks thomax for a patch to add handling for Sun/Moon pos. | |||||
| * | | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 2 | -16/+48 | |
| |\ \ | |/ | ||||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -16/+48 | |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | |||||
| * | | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+5 | |
| |\ \ | |/ | ||||||
| | * | refactor: rename some AssetHelpers.CreateAsset() methods to ↵ | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+5 | |
| | | | | | | | | | CreateNotecardAsset() | |||||
| * | | Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+3 | |
| |\ \ | |/ | ||||||
| | * | very minor removal of old commented out line of code in OdeScene | Justin Clark-Casey (justincc) | 2011-10-21 | 1 | -5/+3 | |
| | | | ||||||
| * | | Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge | Melanie | 2011-10-25 | 1 | -3/+0 | |
| |\ \ | |/ | ||||||
| | * | remove unnecessary null check on _collisionEventPrim | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -3/+0 | |
| | | | ||||||
| * | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 3 | -25/+32 | |
| |\ \ | |/ | ||||||
| | * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 3 | -25/+32 | |
| | | | | | | | | | However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference | |||||
| * | | Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+4 | |
| |\ \ | |/ | ||||||
| | * | Pass PhysicsScene.Simulate() only the MinFrameTime rather than the useless ↵ | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -12/+4 | |
| | | | | | | | | | | | | | | | | | | | Math.Max(SinceLastFrame.TotalSeconds, MinFrameTime) SinceLastFrame was calculating the interval between any sleep that had occurred to pad out the frame time and the start of the next frame. This would usually be below MinFrameTime but occasionally if the sleep was long it would be above, often due to the time required to update the watchdog. This doesn't appear to play much practical role right now. ODE was actually ignoring it entirely. Bullet might be helped slightly by receiving a non-varying value. | |||||
| * | | Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge | Melanie | 2011-10-25 | 2 | -13/+5 | |
| |\ \ | |/ | ||||||
| | * | For now, stop passing timeStep into methods where it's not actually used. | Justin Clark-Casey (justincc) | 2011-10-20 | 2 | -13/+5 | |
| | | | ||||||
| * | | Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 | |
| |\ \ | |/ | ||||||
| | * | Change wording on asset requests. | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -2/+2 | |
| | | | | | | | | | Not all 'notified missing' assets are a problem. Some are invalid references which happen to be buried in other text. | |||||
| * | | Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 | |
| |\ \ | |/ | ||||||
| | * | Removed redundant NotInTransit function from ScenePresence. ↵ | Dan Lake | 2011-10-19 | 1 | -5/+0 | |
| | | | | | | | | | IsInTransit=false does the same thing and NotInTransit was not used anywhere. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |