aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-07-1614-207/+233
|\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Allow setting linked avatar positions from within a prim not the one sat onMelanie2012-07-161-11/+18
| |
| * Remove instrumentation and fix the message delivery issueMelanie2012-07-151-24/+28
| |
| * Testing changes and instrumentationMelanie2012-07-151-3/+20
| |
| * Save packets received while the client is added and replay them later.Melanie2012-07-151-0/+34
| |
| * Reinstate older set rotation code for avatars since it works in all casesMelanie2012-07-151-22/+1
| |
| * Replace sit position and rotation code with older, working versionMelanie2012-07-151-26/+28
| |
| * Revert "Fix a sit rotation issue"Melanie2012-07-151-1/+1
| | | | | | | | This reverts commit 47f7cc9457bfc5c909290ac189b34dd3eceebe7f.
| * Fix a sit rotation issueMelanie2012-07-151-1/+1
| |
| * Revert "Experimentally handle UseCircuitCode synchrnonously"Melanie2012-07-151-2/+1
| | | | | | | | This reverts commit e3fa73da96f5612da52d140425f1633494d6edef.
| * Experimentally handle UseCircuitCode synchrnonouslyMelanie2012-07-151-1/+2
| |
| * Eliminate a spurious exception report when a https url is accessed with a wrongMelanie2012-07-151-0/+2
| | | | | | | | CN
| * Make https work in the poll service managerMelanie2012-07-151-2/+2
| |
| * Fix a double parenthesis typoMelanie2012-07-151-1/+1
| |
| * Set up https to work like http does in the poll handlerMelanie2012-07-151-3/+3
| |
| * Reinstate sleeping because less CPU is preferred over reporting accuracy.Melanie2012-07-141-1/+1
| | | | | | | | Who needs accurate collisions when the sim lags and crashes?
| * In collisions report linksets root parts to parts, and not all parts.UbitUmarov2012-07-134-41/+45
| | | | | | | | | | | | Temporary suspend collision checks on full stopped bodies, until a better away is found wake them, avoiding spurius collision end and start events. Until a nice way is found to avoid them, this may cause some higher cpu load. plus some clean up
| * missed fix on vehicle reference frameUbitUmarov2012-07-131-2/+1
| |
| * fix bad vehicle reference frameUbitUmarov2012-07-131-1/+2
| |
| * Revert " lltargetomega efective spinrate now multiplied by gain ( need check )"Melanie2012-07-131-1/+0
| | | | | | | | | | | | | | Undo figuring gain into spinrate in llTargetOmega. In SL, gain has null effect on nonphysical spinning objects. This reverts commit df55de5b3d88e241f35217d5c08d02b921991513.
| * Use faster any contact point collision detection for Volumedetect, plusUbitUmarov2012-07-123-98/+41
| | | | | | | | some clean up
| * Revert "Add instrumentation to log finalizer being called. Suppressed for ↵Melanie2012-07-122-12/+6
| | | | | | | | | | | | backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980.
| * Revert "Place instrumentation in the proper place. This needs reverting, too!"Melanie2012-07-121-1/+1
| | | | | | | | This reverts commit d9b0b03aa3f92bcd860e4edb656cf6b1221776a6.
| * Add "gc collect" console command for debugging memleaksMelanie2012-07-121-0/+7
| |
| * Place instrumentation in the proper place. This needs reverting, too!Melanie2012-07-111-1/+1
| |
| * Add instrumentation to log finalizer being called. Suppressed for backupMelanie2012-07-112-6/+12
| | | | | | | | | | interim copies to avoid spammage. Not for release to the grid, must be reverted first!
| * Change order of operations on backup to ensure keyframe motions are backedMelanie2012-07-111-2/+6
| | | | | | | | up properly
| * be paranoic (?)UbitUmarov2012-07-111-0/+6
| |
| * Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
| | | | | | | | | | Can't seen more than one evocation on the multicast on this case, even expanding its evocation list (as it should be used in case one fails). With the list i do see what we want.
* | Merge branch 'master' into careminsterMelanie2012-07-161-1/+14
|\ \
| * | sending more user-friendly messages to the script error window rather than ↵SignpostMarv2012-07-161-1/+14
| | | | | | | | | | | | | | | | | | the thrown exceptions. Signed-off-by: Melanie <melanie@t-data.com>
* | | Merge branch 'master' into careminsterMelanie2012-07-163-207/+275
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | update PrimMesher.cs to dll version r72 which fixes some path errors in ↵dahlia2012-07-131-143/+183
| | | | | | | | | | | | sliced linear prims. Addresses Mantis #6085
| * | acting on feedback from justinccSignpostMarv2012-07-141-6/+7
| | |
| * | acting on feedback from justinccSignpostMarv2012-07-141-39/+42
| | |
| * | added in some extra variables, it sometimes thinks it is on the same parcel :(SignpostMarv2012-07-141-5/+7
| | | | | | | | | | | | Signed-off-by: SignpostMarv <github@signpostmarv.name>
| * | adding workaround for silent failure if position is outside the bounds of a ↵SignpostMarv2012-07-141-13/+41
| | | | | | | | | | | | | | | | | | region, implementing parcel prim count check. Signed-off-by: SignpostMarv <github@signpostmarv.name>
| * | Implementation of llSetRegionPos(). Does not implement failure on object ↵SignpostMarv2012-07-143-4/+45
| | | | | | | | | | | | | | | | | | entry/prim limit/access restrictions. Signed-off-by: SignpostMarv <github@signpostmarv.name>
| * | When generating a Warp3D texture, set the detailTexture[i] variable on ↵Justin Clark-Casey (justincc)2012-07-141-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | resize from the JPEG2000 original rather than only saving it to disk. This appears to be the cause of the warp 3d exception seen when starting a new region for the first time. Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk. Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272
* | | Merge branch 'master' into careminsterMelanie2012-07-1328-211/+176
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578Justin Clark-Casey (justincc)2012-07-131-1/+0
| | |
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-1315-84/+67
| | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
| * | Don't cache regions data on the other unused LocalGridServiceConnector that ↵Justin Clark-Casey (justincc)2012-07-134-22/+42
| | | | | | | | | | | | | | | | | | the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
| * | Stop redundantly passing in the endpoint to the LLClientView constructor.Justin Clark-Casey (justincc)2012-07-122-5/+2
| | | | | | | | | | | | This can always be retrieved via the LLUDPClient and is so done in various places already.
| * | Remove IClientIPEndpoint client interface for now.Justin Clark-Casey (justincc)2012-07-122-30/+2
| | | | | | | | | | | | | | | This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor. Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
| * | Remove IClientAPI.GetClientEP() in favour of existing identical ↵Justin Clark-Casey (justincc)2012-07-126-27/+2
| | | | | | | | | | | | IClientAPI.RemoteEndpoint.
| * | Change very recent AllowedViewerList and BannedViewerList config setting ↵Justin Clark-Casey (justincc)2012-07-122-11/+11
| | | | | | | | | | | | | | | | | | | | | names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService] Also changes separator from comma to bar to match existing [LoginService] config features. Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
| * | Extend "show circuits" to show circuit code, ip and viewer name.Justin Clark-Casey (justincc)2012-07-122-20/+36
| | | | | | | | | | | | | | | Also change to use standard table formatting "show circuits" and "show connections" console commands are very similar but access different data structures.
| * | Add active status to "show connections"Justin Clark-Casey (justincc)2012-07-121-1/+7
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-122-23/+93
| |\ \