aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-1024-11/+114
|\
| * Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the...Justin Clark-Casey (justincc)2012-05-0915-0/+0
| * Improve logging on the prim inventory script asset request path for future use.Justin Clark-Casey (justincc)2012-05-094-8/+15
| * Escape and unescape xml element names if necessary in ServerUtils.BuildXmlDat...Justin Clark-Casey (justincc)2012-05-091-3/+3
| * Mantis 6015 new LSL function llGetAgentList.Talun2012-05-094-0/+96
* | Merge branch 'master' into careminsterMelanie2012-05-0916-239/+346
|\ \ | |/
| * Remove physics actor related race conditions in SetVehicleFlags() and SetPhys...Justin Clark-Casey (justincc)2012-05-091-7/+9
| * 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
| * | 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
| * Instead of constantly looking up unchanging self item in script code, pass in...Justin Clark-Casey (justincc)2012-05-0810-190/+145
| * Perform SceneGraph.DuplicateObject() under existing m_updateLock already used...Justin Clark-Casey (justincc)2012-05-081-75/+89
* | 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
| * 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 osGetGridCustom...Justin Clark-Casey (justincc)2012-05-071-8/+10
| * refactor: Instead of performing a ScenePresence lookup twice over LocateClien...Justin Clark-Casey (justincc)2012-05-071-18/+2
| * Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would ...Justin Clark-Casey (justincc)2012-05-071-2/+7
* | 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 O...dahlia2012-05-071-4/+8
| * | 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 m...dahlia2012-05-064-4/+9
| * | 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 dinami...UbitUmarov2012-05-051-17/+17
| * | SOG: tell physics about when we want a force or a impulse. (sorry add to cha...UbitUmarov2012-05-051-2/+4
| * | ubitODE prims: - moved outbounds checking back to UpdatePositionAndVelocity()...UbitUmarov2012-05-051-4/+91
* | | 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 signi...UbitUmarov2012-05-041-2/+4
| * | 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 U...Melanie2012-05-041-2/+2
| * | 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 t...Melanie2012-05-042-28/+8
| * | *TO TEST/REVIEW* added current default animation in animationSet.cs to/fromAr...UbitUmarov2012-05-042-8/+28
| * | SOG copy bug fix, now new group has own empty list of sitted avatars. Also ch...UbitUmarov2012-05-041-12/+54
| * | 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
|\ \ \ | | |/ | |/|
| * | Fire the scripting changed event with CHANGED_OWNER when an object that has c...Justin Clark-Casey (justincc)2012-05-054-15/+30
| * | Use the more efficient HashSet instead of List for FlotasmAssetCache.m_Curren...Justin Clark-Casey (justincc)2012-05-041-1/+1