aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-05-146-525/+195
|\
| * Completely revamp collision handling. Now works as it is supposed to.Melanie2012-05-145-523/+189
| |
| * Check parcel entry permissions when moving objectsMelanie2012-05-141-1/+2
| |
| * Allow non-gods to deed no-mod objectsMelanie2012-05-141-1/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-05-1412-87/+328
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-146-5/+100
| | |
| * | minor: add explanative comment to 'missing baked texture' logging commonly ↵Justin Clark-Casey (justincc)2012-05-141-0/+10
| | | | | | | | | | | | seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
| * | minor: comment out individual attachment transfer log messages for nowJustin Clark-Casey (justincc)2012-05-141-4/+4
| | |
| * | Set the agent in transit teleport flag at the first available opportunity ↵Justin Clark-Casey (justincc)2012-05-141-11/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (i.e. when IsInTransit() was being checked) to close down a race condition. On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts. However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check. This has been seen in the field and the results aren't pretty. This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window. More failure cases are made to to call ResetInTransit() to adjust to this move.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-144-64/+172
| |\ \
| | * \ Merge branch 'master' of /home/opensim/src/OpenSimBlueWall2012-05-132-26/+26
| | |\ \
| | | * | Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ↵Chris Koeritz2012-05-132-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-131-1/+1
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Add configurable SpawnPointRoutingBlueWall2012-05-132-38/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use one of three selected methods to route avatar landing points when using Telehubs. The setting is in [Startup] using SpawnPointRouting = closest/random/sequence closest: The default setting. Routes avatar to the nearest SpawnPoint to the location. random: Picks random SpawnPoints to land the avatar. sequence: Follows a sequence to place the avatar on the next available SpawnPoint location Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | Add more region information to some teleport related loggingJustin Clark-Casey (justincc)2012-05-141-7/+8
| | |/ / | |/| |
* | | | Merge branch 'avination' into careminsterMelanie2012-05-1311-29/+129
|\ \ \ \ | | |_|/ | |/| |
| * | | ubitODE fix force in case of mlinear motor offset presentUbitUmarov2012-05-131-4/+5
| | | |
| * | | display a sleep time of zero if forced spare time to zero, when sim fps is ↵UbitUmarov2012-05-121-2/+7
| | | | | | | | | | | | | | | | lower than desired, for better display coerence.
| * | | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵UbitUmarov2012-05-127-3/+53
| | | | | | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-05-124-0/+96
| |\ \ \
| * | | | ubitODE let vehicles responde faster to changes of some parameters like ↵UbitUmarov2012-05-121-12/+13
| | | | | | | | | | | | | | | | | | | | motors decay times
| * | | | ubitODE reduced again a bit the max allowed correction velocity on ↵UbitUmarov2012-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | colisions, to reduce a bit bouncing inerent to colisions.
| * | | | ubitODE: trial workaround for avatar colisionsUbitUmarov2012-05-121-6/+49
| | | | |
| * | | | revert terminal vel reduction. It helped but not efectiveUbitUmarov2012-05-111-2/+2
| | | | |
* | | | | Merge branch 'avination' into careminsterMelanie2012-05-133-106/+163
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-114-0/+96
| |/ / / | | | | | | | | | | | | Details in the lsl wiki
| * | | reduce avatars terminal velocity to less than 30m/s or colisions with basic ↵UbitUmarov2012-05-102-6/+9
| | | | | | | | | | | | | | | | boxs fail badly. (ode lib problem. chode just may support a bit higher velocity due to the use of tilt).
| * | | ubitode: changes to vehicles servosUbitUmarov2012-05-101-100/+154
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-05-139-32/+444
|\ \ \ \ | | |/ / | |/| |
| * | | Fix mono compiler warning.Justin Clark-Casey (justincc)2012-05-121-1/+1
| | |/ | |/| | | | | | | Last jenkins failure looked like a glitch.
| * | Revert "Save the Telehub and its Spawn Points in the OAR"Justin Clark-Casey (justincc)2012-05-126-100/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008
| * | Save the Telehub and its Spawn Points in the OAROren Hurvitz2012-05-106-5/+100
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Print out more information on connecting botsJustin Clark-Casey (justincc)2012-05-112-9/+19
| | |
| * | Increase minimum period between bot actions to 3 seconds, so that teleport ↵Justin Clark-Casey (justincc)2012-05-111-2/+2
| | | | | | | | | | | | doesn't fall under the minimum 2 second limits that clients take to process it
| * | Stagger multiple bot logins by 5 seconds to make this part of the test more ↵Justin Clark-Casey (justincc)2012-05-111-0/+13
| | | | | | | | | | | | | | | | | | 'realistic' TODO: Need to make this value configurable by a command line parameter to pCampbot
| * | Do bot startup on another thread so console is responsive during this processJustin Clark-Casey (justincc)2012-05-112-1/+5
| | |
| * | Do each bot shutdown on its own threads to prevent one slow shutdown holding ↵Justin Clark-Casey (justincc)2012-05-111-8/+13
| | | | | | | | | | | | | | | | | | | | | up all the rest. This does increase the aggressiveness of shutdown Also prevents the bot list being locked for a long period, which was preventing commands such as "show bots" from working during shutdown
| * | Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, ↵Justin Clark-Casey (justincc)2012-05-112-5/+22
| | | | | | | | | | | | Connnected and Disconnecting states
| * | If a bot is not connected, show region name "(none)" instead of throwing an ↵Justin Clark-Casey (justincc)2012-05-111-1/+3
| | | | | | | | | | | | exception in the "show bots" command of pCampbot
| * | Add ConsoleTable framework class for future uniform formatting of console ↵Justin Clark-Casey (justincc)2012-05-102-8/+165
| | | | | | | | | | | | | | | | | | | | | output tables. Still subject to change - if you use this be prepared to change your output code if/when the methods change. Make new "attachments show" command use this.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-103-7/+34
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-1028-27/+136
| | |\ \
| | * | | Add even for terrain tainting and synchronize terrain module with physics ↵Dan Lake2012-05-103-7/+34
| | | | | | | | | | | | | | | | | | | | scene before physics simulation step rather than after
| * | | | Add "attachments" show console command that will show the server's record of ↵Justin Clark-Casey (justincc)2012-05-101-0/+177
| | |/ / | |/| | | | | | | | | | | | | | | | | | which attachments an in-scene avatar has. For debugging purposes.
* | | | Merge branch 'master' into careminsterMelanie2012-05-103-9/+13
|\ \ \ \ | |/ / /
| * | | Saving estate state is really slow (relatively) and it getsMic Bowman2012-05-103-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completely rewritten every time a region starts up. This makes the data write only when the data was not already read from the database. There is a still a major race condition whenever two regions share the same estate data, but at least it won't be triggered on startup.
* | | | Merge branch 'master' into careminsterMelanie2012-05-1024-11/+114
|\ \ \ \ | |/ / /
| * | | Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵Justin Clark-Casey (justincc)2012-05-0915-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the actual class names. This is usually because the file name was singular (*Service*) but the class name was plural (*Services*). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes.
| * | | Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-094-8/+15
| | | | | | | | | | | | | | | | This adds name and description of the request handler to http request logging when DebugLevel >= 1
| * | | Escape and unescape xml element names if necessary in ↵Justin Clark-Casey (justincc)2012-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ServerUtils.BuildXmlData() and ParseElement() If AvatarService appearance data is retrieved over the network, then ServerUtils was attempting to transfer names such as "Wearable 0:0" directly to xml element names, resulting in an exception. Space is not valid in xml element names. Neither is : in this case since the intention is not to namespace. Using names directly as keys is not a good idea. To get around this problem this patch escapes and unescapes the element names as appropriate. This has no impact on existing xml (since it had to be valid in the first place) but allows AvatarService data to be used over the network. Setting appearance (from simulator to AvatarService) did not suffer this problem since the values are passed in the query string which is already properly escaped.
generated by cgit v1.1 at 2024-10-18 01:19:21 +0000