aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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.
| * | | Mantis 6015 new LSL function llGetAgentList.Talun2012-05-094-0/+96
| | | | | | | | | | | | | | | | Details in the lsl wiki
* | | | Merge branch 'master' into careminsterMelanie2012-05-0916-239/+346
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * | | Remove physics actor related race conditions in SetVehicleFlags() and ↵Justin Clark-Casey (justincc)2012-05-091-7/+9
| |/ / | | | | | | | | | | | | | | | SetPhysicsAxisRotation() sop.PhysActor can currently become null at any time.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-05-081-0/+2
| |\ \
| | * | Mantis 1456 same region teleport of a sitting avatar.Talun2012-05-091-0/+2
| | | | | | | | | | | | | | | | | | | | Region to region was fixed some time ago in EntityTransferModule. This applies the same fix for same region teleports.
| * | | Trigger event when scene presences are updatedDan Lake2012-05-082-0/+34
| |/ /
| * | Add automated TestllBreakLink()Justin Clark-Casey (justincc)2012-05-081-0/+27
| | |
| * | Add automated TestllCreateLink()Justin Clark-Casey (justincc)2012-05-081-0/+112
| | |
| * | refactor: Eliminate local id parameter from api initialize.Justin Clark-Casey (justincc)2012-05-0810-46/+36
| | | | | | | | | | | | This is always available from m_host.LocalId
| * | Instead of constantly looking up unchanging self item in script code, pass ↵Justin Clark-Casey (justincc)2012-05-0810-190/+145
| | | | | | | | | | | | in self item on initialization.
| * | Perform SceneGraph.DuplicateObject() under existing m_updateLock already ↵Justin Clark-Casey (justincc)2012-05-081-75/+89
| | | | | | | | | | | | | | | | | | | | | used for link and delinking, in order to avoid race conditions. DuplicateObject() relies on source object having correct link numbers for the duration of the dupe. Both link and delink can change link numbers such that they are not consistent for short periods of time.
* | | Merge branch 'master' into careminsterMelanie2012-05-083-47/+38
|\ \ \ | |/ /
| * | Revert "Better error handling if Load OAR or Save OAR fail"Justin Clark-Casey (justincc)2012-05-073-32/+6
| | | | | | | | | | | | | | | | | | This reverts commit 65c88b2ff4e2616fa5c1d4c5e75298ed1eb1c0d8. Yet again I accidentally committed something whilst evaluating it.
| * | Log the full exception when errors occur in BaseHttpServerOren Hurvitz2012-05-071-19/+19
| | |
| * | Better error handling if Load OAR or Save OAR failOren Hurvitz2012-05-073-6/+32
| | |
| * | For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and ↵Justin Clark-Casey (justincc)2012-05-071-8/+10
| | | | | | | | | | | | | | | | | | osGetGridCustom(), try to read from the [GridInfoService] section on standalone rather than [GridInfo] [GridInfoService] is the section that's actually in bin/config-include/StandaloneCommon.ini.example
| * | refactor: Instead of performing a ScenePresence lookup twice over ↵Justin Clark-Casey (justincc)2012-05-071-18/+2
| | | | | | | | | | | | LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()
| * | Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would ↵Justin Clark-Casey (justincc)2012-05-071-2/+7
| | | | | | | | | | | | not be notified once a non-local friend was found.
* | | Merge branch 'avination' into careminsterMelanie2012-05-083-15/+46
|\ \ \ | | |/ | |/|
| * | Merge branch 'ubitwork' into avinationMelanie2012-05-071-11/+17
| |\ \
| | * | minor change to linear motor decayUbitUmarov2012-05-071-11/+17
| | | |
| * | | Fix moving no-mod objects. Fixes a regression introduced with the undo fixMelanie2012-05-072-4/+29
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-05-077-12/+21
|\ \ \ | | |/ | |/|
| * | add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for ↵dahlia2012-05-071-4/+8
| | | | | | | | | | | | OpenMetaverse.Primitive object
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-074-5/+5
| | |
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for ↵dahlia2012-05-064-4/+9
| | | | | | | | | | | | moving NPCs
| * | Stop llSetPos from sending one update per child primMelanie2012-05-061-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2012-05-073-23/+112
|\ \ \ | | |/ | |/|
| * | UbitODE: reduced the diference btw dinamic and static friction, making ↵UbitUmarov2012-05-051-17/+17
| | | | | | | | | | | | dinamic larger more identical to static.
| * | SOG: tell physics about when we want a force or a impulse. (sorry add to ↵UbitUmarov2012-05-051-2/+4
| | | | | | | | | | | | change here also)
| * | ubitODE prims: - moved outbounds checking back to ↵UbitUmarov2012-05-051-4/+91
| | | | | | | | | | | | UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force)
* | | Merge branch 'avination' into careminsterMelanie2012-05-054-20/+136
|\ \ \ | |/ /
| * | force lower avatar density for testingUbitUmarov2012-05-051-0/+4
| | |
| * | UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any ↵UbitUmarov2012-05-041-2/+4
| | | | | | | | | | | | significant change like new 'velocity' or new position, etc, requests
| * | Fix teleporting from older to newer regionsMelanie2012-05-041-1/+8
| | |
| * | Add the default animation to the child agent data updateMelanie2012-05-042-0/+14
| | |
| * | Reverse the order of physics event unsubscription to allow GC. Adapted from ↵Melanie2012-05-041-2/+2
| | | | | | | | | | | | Unit's reverted patch
| * | Retain velocity on walking crossing - adapted from Ubit's reverted patchMelanie2012-05-041-1/+13
| | |
| * | Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs ↵Melanie2012-05-042-28/+8
| | | | | | | | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);" This reverts commit 12c9916193bbb87aaa95407f798c241cbe5e23cb.
| * | *TO TEST/REVIEW* added current default animation in animationSet.cs ↵UbitUmarov2012-05-042-8/+28
| | | | | | | | | | | | to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
| * | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ↵UbitUmarov2012-05-041-12/+54
| | | | | | | | | | | | changed crossing code to restore sitting avas in case of group cross fail
| * | Stabilize sit position on region crossingMelanie2012-05-031-1/+7
| | |
| * | Clear permissions given to the object we stand up fromMelanie2012-05-032-2/+31
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-0557-357/+780
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has ↵Justin Clark-Casey (justincc)2012-05-054-15/+30
| | | | | | | | | | | | | | | | | | | | | changed owners is rezzed. This needs to occur after the script is resumed rather than before, when the event is just dropped. Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
| * | Use the more efficient HashSet instead of List for ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | | | | | FlotasmAssetCache.m_CurrentlyWriting
generated by cgit v1.1 at 2024-10-18 10:20:19 +0000