| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix the offline message module to revert core changes and restore avn | Melanie | 2011-10-28 | 1 | -18/+28 |
| | | | | | specific behavior | ||||
| * | Reduce severity and remove duplication if a common log message regarding | Melanie | 2011-10-28 | 1 | -3/+1 |
| | | | | | baked textures | ||||
| * | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-27 | 27 | -218/+209 |
| |\ | |||||
| | * | Merge branch 'master' into bigmerge | Melanie | 2011-10-27 | 27 | -218/+209 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | Removed use of 'is' operator and casting to find the root ScenePresence in ↵ | Dan Lake | 2011-10-27 | 4 | -82/+53 |
| | | | | | | | | | | | | | MessageTransfer modules and Groups module. | ||||
| | | * | Continuation of previous checkin. Found more places where ↵ | Dan Lake | 2011-10-27 | 4 | -57/+39 |
| | | | | | | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence. | ||||
| | | * | Added new ForEachRootScenePresence to Scene since almost every delegate ↵ | Dan Lake | 2011-10-27 | 14 | -88/+79 |
| | | | | | | | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors. | ||||
| | | * | For now, comment out error message on new script engine console commands. | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine | ||||
| | | * | Comment out inventory folder bulk update code on InventoryAccepted message ↵ | Justin Clark-Casey (justincc) | 2011-10-27 | 1 | -12/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | introduced in commit db91044 on Aug 22 2011 This should be unecessary since the folder update is already made at the time of the offer (and moved to trash if not accepted). This code was also not taking into account the situation where an item was accepted. Needs more fixing if this results in an aggression elsewhere. | ||||
| | | * | 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 | 59 | -164/+495 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 7 | -21/+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 | 53 | -149/+412 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs | ||||
| | | * | Restart the event queue worker threads that I accidentally disabled earlier ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -9/+11 |
| | | | | | | | | | | | | | | | | | | | today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite) | ||||
| | | * | In Watchdog, add ability to specific timeout for a thread. | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -16/+56 |
| | | | | | | | | | | | | | This also changes the point of registration to the StartThread() call rather than the first Update() | ||||
| | | * | Add m_threads dictionary locking to Watchdog.GetThreads() | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -1/+2 |
| | | | | |||||
| | | * | 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 | ||||
| | | * | minor: add "threads show" as synonym for "show threads" for consistency | Justin Clark-Casey (justincc) | 2011-10-25 | 1 | -0/+5 |
| | | | | |||||
| | | * | Add "threads abort <thread-id>" simulator console command that allows us to ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 2 | -2/+48 |
| | | | | | | | | | | | | | | | | | | | abort a watchdog managed thread. This is for diagnostic purposes. | ||||
| | | * | Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵ | Justin Clark-Casey (justincc) | 2011-10-25 | 43 | -69/+243 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge | Melanie | 2011-10-25 | 1 | -12/+2 |
| |\ \ | |/ | |||||
| | * | Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer() | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -12/+2 |
| | | | | | | | | | Remove() presumably does this check anyway since it just returns false if the key is not in the collection. | ||||
| * | | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge | Melanie | 2011-10-25 | 4 | -9/+31 |
| |\ \ | |/ | |||||
| | * | Fix bugs in EventQueueGetModule.ClientClosed() and ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 4 | -9/+31 |
| | | | | | | | | | | | | | 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 | 7 | -5/+176 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | ||||
| | * | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 7 | -5/+177 |
| | | | | | | | | | | | 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 | 5 | -24/+68 |
| |\ \ | |/ | |||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 5 | -24/+68 |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |