| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-24 | 1 | -3/+19 | |
| |\ \ | |/ | ||||||
| | * | Stop an exception being thrown and a teleport/border cross failing if the ↵ | Justin Clark-Casey (justincc) | 2011-11-22 | 1 | -3/+19 | |
| | | | | | | | | | | | | | | | desintation sim has no active script engines. This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry. Callers adjusted to stop checking for the list reference being null (which never happened anyway) | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -1/+1 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | |||||
| | * | Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵ | Justin Clark-Casey (justincc) | 2011-11-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 5 | -276/+35 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||||
| | * | fix build break on UserManagementModule. | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -8/+15 | |
| | | | | | | | | | This also adds time since started to "show threads". Unfortunately these two changes got mixed in. | |||||
| | * | improve formatting of "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -1/+8 | |
| | | | ||||||
| | * | send a watchdog heartbeat for a poll worker thread when it's actually run | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -0/+3 | |
| | | | ||||||
| | * | Add number of milliseconds since last update to "show threads" | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -4/+18 | |
| | | | ||||||
| | * | Remove unused RegionCommsListener/IRegionCommsListener. | Justin Clark-Casey (justincc) | 2011-11-15 | 2 | -272/+0 | |
| | | | | | | | | | All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-12 | 1 | -2/+3 | |
| |\ \ | |/ | ||||||
| | * | doh - correct build break | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -6/+7 | |
| | | | ||||||
| | * | Add threads to the watchdog thread list before we start them. | Justin Clark-Casey (justincc) | 2011-11-12 | 1 | -5/+5 | |
| | | | | | | | | | Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-10 | 1 | -8/+6 | |
| |\ \ | |/ | ||||||
| | * | Remove unused avariable in PollServiceRequestManager | Justin Clark-Casey (justincc) | 2011-11-07 | 1 | -8/+6 | |
| | | | ||||||
| | * | Convert SendKillObject to take a list of uint rather than sending one | Melanie | 2011-11-06 | 1 | -1/+1 | |
| | | | | | | | | | packet per prim. More to come as we change to make use of this. | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-11-05 | 1 | -24/+12 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | Fix avatar height, removes the hip offset hack | nebadon | 2011-11-05 | 1 | -24/+12 | |
| | | | | | | | | | Author: Mana Janus <mana@mjm-labs.com> | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 1 | -8/+0 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-10-26 | 15 | -80/+330 | |
| |\ \ | |/ | | | | | | | 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 | |
| | | | ||||||
| | * | 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 | 13 | -64/+212 | |
| | | | | | | | | | | | | | | | | | | | 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) | |||||
| * | | 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 | 2 | -5/+9 | |
| |\ \ | |/ | ||||||
| | * | Fix bugs in EventQueueGetModule.ClientClosed() and ↵ | Justin Clark-Casey (justincc) | 2011-10-24 | 2 | -5/+9 | |
| | | | | | | | | | | | | | 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 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge | Melanie | 2011-10-25 | 2 | -5/+6 | |
| |\ \ | |/ | ||||||
| | * | Get UUIDGatherer to scan notecards in the graph for asset uuids. | Justin Clark-Casey (justincc) | 2011-10-22 | 2 | -5/+6 | |
| | | | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743 | |||||
| * | | Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge | Melanie | 2011-10-25 | 1 | -2/+2 | |
| |\ \ | |/ | ||||||
| | * | refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter ↵ | Justin Clark-Casey (justincc) | 2011-10-17 | 1 | -2/+2 | |
| | | | | | | | | | without a getter | |||||
| * | | Merge commit 'ddf54b5537f2701deeb615ef8e1eeef20b746ea1' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+0 | |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | move see_into_this_sim_from_neighbor [Startup] flag parsing into Scene with ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -5/+0 | |
| | | | | | | | | | the others | |||||
| * | | Merge commit '528cc8136e567b5bac583728fbb0235baaba2f02' into bigmerge | Melanie | 2011-10-25 | 1 | -5/+2 | |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | fetch physical_prim switch from [Startup] config from inside scene, as is ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -5/+2 | |
| | | | | | | | | | done for most other scene config params | |||||
| * | | Merge commit '3843efe478ed682fd08bf12ea8bd7377c68a36fb' into bigmerge | Melanie | 2011-10-25 | 1 | -0/+6 | |
| |\ \ | |/ | ||||||
| | * | Restore [Startup] physical_prim flag which can stop any prims being subject ↵ | Justin Clark-Casey (justincc) | 2011-10-15 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | to physics This had stopped working. However, at the moment it still allows the physics flag to be set even though this has no effect. This needs to be fixed. Default for this flag is true as previously. | |||||
| * | | Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+8 | |
| |\ \ | |/ | ||||||
| | * | refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it ↵ | Justin Clark-Casey (justincc) | 2011-10-14 | 1 | -1/+8 | |
| | | | | | | | | | sends entity updates (including presence ones), not just prims. | |||||
| * | | Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge | Melanie | 2011-10-25 | 2 | -38/+0 | |
| |\ \ | |/ | ||||||
| | * | Get rid of some traces of the old pre-ROBUST grid architecture config | Justin Clark-Casey (justincc) | 2011-10-12 | 2 | -38/+0 | |
| | | | ||||||
| * | | Adjust CM version tag | Melanie | 2011-10-12 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ | |/ | ||||||
| | * | flip master version up to 0.7.3 | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -2/+1 | |
| | |\ | ||||||
| * | \ | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+0 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 1 | -3/+0 | |
| | | | | | | | | | | | | | This appears to be code clutter since the code that uses this has long gone. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |