aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Fix the offline message module to revert core changes and restore avnMelanie2011-10-281-18/+28
| | | | | | | | | | | | specific behavior
* | | Reduce severity and remove duplication if a common log message regardingMelanie2011-10-281-3/+1
| | | | | | | | | | | | baked textures
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-2727-218/+209
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-10-2727-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 Lake2011-10-274-82/+53
| | | | | | | | | | | | | | | | MessageTransfer modules and Groups module.
| | * | Continuation of previous checkin. Found more places where ↵Dan Lake2011-10-274-57/+39
| | | | | | | | | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence.
| | * | Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake2011-10-2714-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-271-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-271-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-271-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/opensimJustin Clark-Casey (justincc)2011-10-273-14/+93
| | |\
| | * | Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵Justin Clark-Casey (justincc)2011-10-273-1/+26
| | | | | | | | | | | | | | | | only receive the very first collision.
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-2640-81/+166
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into bigmergeMelanie2011-10-266-13/+89
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-261-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 settingSignpostMarv Martin2011-10-262-4/+18
| | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | Implementing PRIM_LINK_TARGET, but only for setting paramsSignpostMarv Martin2011-10-262-4/+14
| | |/ | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Merge branch 'master' into bigmergeMelanie2011-10-2634-68/+77
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| | * Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe ↵Justin Clark-Casey (justincc)2011-10-251-0/+2
| | | | | | | | | | | | from collision events
| | * 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 ↵Justin Clark-Casey (justincc)2011-10-253-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-252-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-253-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-251-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-251-4/+4
| | | | | | | | | | | | it's an OdePrim
| | * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-2526-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 callMelanie2011-10-251-0/+1
|/ /
* | Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmergeMelanie2011-10-252-4/+22
|\ \ | |/
| * Fix bugs in EventQueueGetModule.ClientClosed() and ↵Justin Clark-Casey (justincc)2011-10-242-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 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 ↵Justin Clark-Casey (justincc)2011-10-243-2/+75
| | | | | | | | registers an http poll
* | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmergeMelanie2011-10-251-1/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
| * Add optional getauthinfo and setauthinfo authentication service calls.Justin Clark-Casey (justincc)2011-10-241-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 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
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5748
* | Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmergeMelanie2011-10-251-0/+3
|\ \ | |/
| * Add case to Lightshare/WindlightBlueWall2011-10-221-0/+3
| | | | | | | | Thanks thomax for a patch to add handling for Sun/Moon pos.
* | 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
| | | | | | | | | | 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 bigmergeMelanie2011-10-252-5/+5
|\ \ | |/
| * refactor: rename some AssetHelpers.CreateAsset() methods to ↵Justin Clark-Casey (justincc)2011-10-222-5/+5
| | | | | | | | CreateNotecardAsset()
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-11-17 07:34:23 +0000