| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-07 | 4 | -58/+107 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'bulletsim2' | Robert Adams | 2012-07-06 | 4 | -58/+107 | |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup preceeding major work. No major functional changes. Collisions reported to simulator more efficiently. BulletSim binaries updated using a more recent version of Bullet (v2.80-r2527). | |||||
| | | | * | | Clean up collision reporting code so they are properly passed to | Robert Adams | 2012-07-06 | 4 | -58/+107 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | the simulator in batches. More comments. | |||||
| | * | | | | Remove redundant SetScene() function in Scene.AddSceneObject() | Justin Clark-Casey (justincc) | 2012-07-07 | 5 | -25/+13 | |
| | |/ / / | | | | | | | | | | | | | | | | | This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks. There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions. | |||||
| | * | | | Remove now duplicate interregion object check that should have been removed ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -12/+0 | |
| | | | | | | | | | | | | | | | | | a few commits ago in 43a2da9 | |||||
| | * | | | minor: Remove some wrong comments in attachments regression tests | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -2/+0 | |
| | |/ / | ||||||
| | * | | Add assert to attachment regression tests to check that number of objects in ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 3 | -5/+38 | |
| | | | | | | | | | | | | | the scene graph | |||||
| | * | | Mantis 6077 trim NPC chat on channel zero. | Talun | 2012-07-06 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | This patch trims leading and trailing spaces from NPC chat and suppresses the sending of empty chat strings on open chat channel 0. | |||||
| | * | | Mantis 6063 osNpcTouch. | Talun | 2012-07-06 | 6 | -0/+98 | |
| | | | | | | | | | | | | | Allow NPCS to touch obects. | |||||
| | * | | Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -14/+27 | |
| | | | | | | | | | | | | | | | | | | | Scene.AddObject() Only IncomingCreateObject() needs these checks. General object adding does not need to perform crossing perm checks | |||||
| | * | | refactor: extract method UpdateUserInventoryWithAttachment() from ↵ | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -29/+38 | |
| | | | | | | | | | | | | | AttachObject() for better code comprehension | |||||
| | * | | Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not set | Justin Clark-Casey (justincc) | 2012-07-06 | 1 | -2/+6 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2012-07-06 | 14 | -113/+332 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | added llSetVelocity. will refuse to work on vehicles and on attachments ( ↵ | UbitUmarov | 2012-07-06 | 4 | -1/+57 | |
| | | | | | | | | | | | | | this last may need fix) added also some code for llSetAngularVelocity but not working still | |||||
| | * | | Add an EventType enum and Type field to the poll service event args. This allows | Melanie | 2012-07-05 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | the manager to tell what type of event it is. All events except for lsl http in go to the "slow queue" which is run once per second as before. | |||||
| | * | | added a timeout paramenter to PollServiceEventArgs, so each type can define ↵ | UbitUmarov | 2012-07-04 | 2 | -3/+3 | |
| | | | | | | | | | | | | | it's timeout | |||||
| | * | | Merge branch 'ubitwork' into avination | Melanie | 2012-07-02 | 1 | -11/+38 | |
| | |\ \ | ||||||
| | | * \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-01 | 2 | -4/+3 | |
| | | |\ \ | ||||||
| | | * | | | ubitode: create and use 4 off world collision spaces for offworld static prims | UbitUmarov | 2012-06-30 | 1 | -11/+38 | |
| | | | | | | ||||||
| | * | | | | Implement the buggy version of llXorBase64Strings() for compatibility's sake | Melanie | 2012-07-02 | 1 | -3/+84 | |
| | | | | | | ||||||
| | * | | | | Bring casing of llSHA1String in line with SL | Melanie | 2012-07-01 | 1 | -1/+1 | |
| | | |/ / | |/| | | ||||||
| | * | | | Remove spammy debug | Melanie | 2012-06-29 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-06-29 | 1 | -0/+3 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem ↵ | UbitUmarov | 2012-06-29 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing | |||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-06-29 | 1 | -2/+8 | |
| | |\ \ \ | | |/ / | ||||||
| | | * | | don't recoil attachments doing llRezObject() | UbitUmarov | 2012-06-29 | 1 | -2/+8 | |
| | | | | | ||||||
| | | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-29 | 4 | -11/+32 | |
| | | |\ \ | ||||||
| | * | | | | stop chat being sent to child avs again. | Melanie | 2012-06-29 | 1 | -3/+2 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-06-28 | 7 | -87/+141 | |
| | |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | ||||||
| | | * | | reactivate physics raycasts on llCastRay() until it's clear what is its ↵ | UbitUmarov | 2012-06-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | problem if any... | |||||
| | | * | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-06-28 | 3 | -4/+6 | |
| | | |\ \ | ||||||
| | | * | | | fix a seg fault in sp.cs | UbitUmarov | 2012-06-25 | 1 | -1/+2 | |
| | | | | | | ||||||
| | | * | | | coment out some of previus debug messaged before forgetting about them... | UbitUmarov | 2012-06-22 | 1 | -2/+2 | |
| | | | | | | ||||||
| | | * | | | more debug | UbitUmarov | 2012-06-22 | 1 | -0/+3 | |
| | | | | | | ||||||
| | | * | | | i more debug | UbitUmarov | 2012-06-22 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | add a temp debug message | UbitUmarov | 2012-06-22 | 1 | -0/+3 | |
| | | | | | | ||||||
| | | * | | | fix turning off phanton always decreasing number of physical parts | UbitUmarov | 2012-06-21 | 1 | -28/+28 | |
| | | | | | | ||||||
| | | * | | | fix SceneGraph Add/Remove PhysicalPrim counters | UbitUmarov | 2012-06-21 | 1 | -2/+2 | |
| | | | | | | ||||||
| | | * | | | don't send a lot of avatar data when we are just changing position or ↵ | UbitUmarov | 2012-06-17 | 1 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | rotation ( SendTerseUpdateToAllClients() in place of SendAvatarDataToAllAgents() ) | |||||
| | | * | | | *CHECK/REVIEW* comented out not used sp.ParentPosition. Comented out ↵ | UbitUmarov | 2012-06-17 | 2 | -14/+24 | |
| | | | | | | | | | | | | | | | | | | | | | SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment ) | |||||
| | | * | | | split ugly expression in a if making it simpler to read | UbitUmarov | 2012-06-17 | 1 | -3/+5 | |
| | | | | | | ||||||
| | | * | | | Don't let scripts rotate root part of physical linksets like SL, Update ↵ | UbitUmarov | 2012-06-17 | 1 | -35/+66 | |
| | | | | | | | | | | | | | | | | | | | | | client rotation of avatars 'linked' to child parts. (put back some 'cosmetics' from previus commit). Still let lsl api use physics engine ideia of part Physical state on this where it should be SOP ideia, so is that is clear that sync with engine is SOP responsability. | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-07-05 | 21 | -314/+579 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | | | regrade osFormatString, osMatchString and osReplaceString to VeryLow. | Justin Clark-Casey (justincc) | 2012-07-05 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | I can't see that these present any real hazard to sim functioning. | |||||
| | * | | | | porting console commands from raw2sculpt 3.2 | SignpostMarv | 2012-07-05 | 1 | -0/+34 | |
| | | | | | | ||||||
| | * | | | | Add OSSL function osForceAttachToAvatarFromInventory() | Justin Clark-Casey (justincc) | 2012-07-05 | 15 | -41/+293 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first. Still only attaches objects to the owner of the script. This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them. Threat level high. | |||||
| | * | | | | Use GetInventoryItem() in llRezAtRoot rather than iterating through a cloned ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -40/+36 | |
| | | | | | | | | | | | | | | | | | | | | | dictionary | |||||
| | * | | | | refactor: In llGetNotecardLine() use existing GetInventoryItem() rather than ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -10/+4 | |
| | | | | | | | | | | | | | | | | | | | | | inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe | |||||
| | * | | | | refactor: In llGetNumberOfNotecardLines() use existing GetInventoryItem() ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -10/+4 | |
| | | | | | | | | | | | | | | | | | | | | | rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe | |||||
| | * | | | | refactor: use existing GetInventoryItem() in GetScriptByName(), itself ↵ | Justin Clark-Casey (justincc) | 2012-07-04 | 1 | -13/+9 | |
| | | | | | | | | | | | | | | | | | | | | | renamed from ScriptByName() | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |