aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-054-69/+124
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix build breakMelanie2009-10-051-1/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-0560-1804/+1769
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0227-1402/+814
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into vehiclesMelanie2009-10-0233-450/+647
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Revert "* Adding Scale to EntityBase * Fixing the incorrect initialization ↵Melanie2009-10-026-46/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of EntityBase.Rotation * Removed SceneObjectGroup.GroupRotation and added overrides for Scale/Rotation/Velocity" This reverts commit 39842eb4af3b5a8c52d56c0f7f05ad54f0651bb0.
| | * | | | | | | | | | | | | Fix a merge conflictMelanie2009-10-011-1/+1
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'master' into vehiclesMelanie2009-10-01294-5286/+2849
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim ↵Melanie2009-09-3012-751/+1468
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into vehicles
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch '0.6.7-post-fixes' into vehiclesKitto Flora2009-09-3086-658/+4314
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | And another merge issueKitto Flora2009-09-301-0/+1
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | And anotherKitto Flora2009-09-301-1/+1
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Another small change to avoid later merge conflictKitto Flora2009-09-301-2/+3
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Small chaneg to adapt to trunkKitto Flora2009-09-301-2/+3
| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Commit initial version of KittoFlora's vehicle changesopensim2009-09-3012-757/+1471
| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | change 0.6.7 candidate branch down to RC1Justin Clark-Casey (justincc)2009-09-291-1/+1
| | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix loading modules with alternate configurations and ports into ROBUST.Melanie2009-09-2914-55/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make all current modules support the configuration name option
| | * | | | | | | | | | | | | | | Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.Diva Canto2009-09-291-4/+8
| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'master' into 0.6.7-post-fixesMelanie2009-09-282-6/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs
| | * | | | | | | | | | | | | | | | Bump version number in post-fixesMelanie2009-09-281-2/+2
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fixing the patch to the patchSnowcrash2009-10-221-3/+6
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Fix rounding error in PRIM_SIZE portion of llSetPrimitiveParamsSnowcrash2009-10-221-3/+4
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Terrible typo in the previous commit!John Hurliman2009-10-221-1/+1
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | * Added a check if Util.m_ThreadPool is null before trying to use it, and if ↵John Hurliman2009-10-221-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so initialize it to sane defaults * Simplified the InitThreadPool() function
* | | | | | | | | | | | | | | | | Add copyright header. Formatting cleanup.Jeff Ames2009-10-222-1/+28
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | A synchronous call to the messaging server was blocking the process of ↵John Hurliman2009-10-221-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | promoting an agent to a root agent (logins and teleports). Changed to an async method
* | | | | | | | | | | | | | | | | * Allow SmartThreadPool to be initialized without setting max stack size ↵John Hurliman2009-10-222-6/+13
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (like the original implementation) * Only initialize Util's SmartThreadPool if it is actually being used * No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
* | | | | | | | | | | | | | | | Remove the "mel_t" from version stringMelanie2009-10-221-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'melanie_test' into prioritizationMelanie2009-10-224-60/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes SmartThreadPool configurable and also makes it the default, since the regular thread pool simply stinks.
| * | | | | | | | | | | | | | | | Make the LSL scripting delays take full effect. To tune, tweat theMelanie2009-10-221-56/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptDelayFactor in config
| * | | | | | | | | | | | | | | | Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2Melanie2009-10-222-2/+2
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Add MaxPoolThreads in startup to limit the size of the thread pool usedMelanie2009-10-222-12/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for FireAndForget. This lets us limit concurrency to make OpenSim play nice
| * | | | | | | | | | | | | | | | Mark new versionMelanie2009-10-221-1/+1
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | * Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to ↵John Hurliman2009-10-218-36/+70
|/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Util.FireAndForget() * Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
* | | | | | | | | | | | | | | | * Change the OnQueueEmpty signature to send the flags of the queues that are ↵John Hurliman2009-10-215-61/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | empty instead of firing once per empty queue * Change the OnQueueEmpty firing to use a minimum time until next fire instead of a sleep * Set OutgoingPacket.TickCount = 0 earlier to avoid extra resends when things are running slowly (inside a profiler, for example)
* | | | | | | | | | | | | | | | * Clarified what FireQueueEmpty is doing with a MIN_CALLBACK_MS constant and ↵John Hurliman2009-10-214-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upped it to 30ms * Removed the unused PacketSent() function * Switched UnackedPacketCollection from a SortedDictionary to a Dictionary now that the sorting is no longer needed. Big performance improvement for ResendUnacked()
* | | | | | | | | | | | | | | | Merged master into prioritizationJohn Hurliman2009-10-217-55/+263
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Fix llParticleSystem to accept LSL variables and LSL constants in placeMelanie2009-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the named constants for the rule selector. Information provided by Snowcrash
| * | | | | | | | | | | | | | | | Patch by mcortez: Remove lock from scene presence updating in groups moduleMelanie2009-10-211-9/+7
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix web map retrieval for regions configured via .iniMelanie2009-10-211-2/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Really make module port selection work. Implement port setting inMelanie2009-10-213-7/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LLProxyLoginModule.
| * | | | | | | | | | | | | | | | Cleanup and comment the region module loader. Add support for configuringMelanie2009-10-201-26/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a server port to use for modules in a generic way and also add support for disabling modules that don't support proper disabling. Add support for selective loading by class name (advanced users only)
| * | | | | | | | | | | | | | | | Add MainServer.GetHttpServer(port) method for using multiple listenerMelanie2009-10-201-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ports in region modules
| * | | | | | | | | | | | | | | | Change "config save" to "config save <filename>", which is mandatory.Melanie2009-10-201-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File name is enforced to NOT be OpenSim.ini
| * | | | | | | | | | | | | | | | Fix for index error in llList2StringSnowcrash2009-10-201-6/+6
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | * FireQueueEmpty now checks if a measurable amount of time has passed, and ↵John Hurliman2009-10-213-38/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if not it sleeps for a small amount of time. This throttles OnQueueEmpty calls where there is no callback or the callback is doing very little work * Changed HandleQueueEmpty()'s Monitor.TryEnter() calls to locks. We want to take our time in this function and do all the work necessary, since returning too fast will induce a sleep anyways
* | | | | | | | | | | | | | | | * Changed the timing calculations for sending resends/acks/pings from ↵John Hurliman2009-10-213-41/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | per-client back to per-scene * Testing a fix from Jim to make the cpu usage fix cleaner
* | | | | | | | | | | | | | | | Testing out a hack to identify the source of the high cpu usageJohn Hurliman2009-10-211-0/+3
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Removing the Sleep(0) call from the OutgoingPacketHandlerJohn Hurliman2009-10-211-6/+3
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | * Handle UseCircuitCode packets asynchronously. Adding an agent to a scene ↵John Hurliman2009-10-213-13/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can take several seconds, and was blocking up packet handling in the meantime * Clamp retransmission timeout values between three and 10 seconds * Log outgoing time for a packet right after it is sent instead of well before * Loop through the entire UnackedPacketCollection when looking for expired packets