aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-304-22/+66
|\
| * Add materials store null check into UuidGatherer code.Justin Clark-Casey (justincc)2013-06-281-0/+4
| * Reinsert code for gathering uuids reference by materials back directly into U...Justin Clark-Casey (justincc)2013-06-282-30/+99
| * refactor: Move code for gathering textures referenced by materials into Mater...Justin Clark-Casey (justincc)2013-06-272-67/+33
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-272-9/+11
| * Improve situation where editing just the root prim of an attachment causes ot...Justin Clark-Casey (justincc)2013-06-251-1/+10
| * Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 ...Justin Clark-Casey (justincc)2013-06-251-10/+4
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-231-5/+5
| |\
| | * Fix other places when saving scripts or notecards in prim inventories where m...Justin Clark-Casey (justincc)2013-06-181-5/+5
* | | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \ \ | |/ /
| * | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| |/
* | Merge branch 'master' into careminsterMelanie2013-06-134-3/+14
|\ \ | |/
| * * This fixes having to select and deselect prim to get keyframemotion to star...teravus2013-06-121-0/+5
| * Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-113-3/+9
* | Merge branch 'master' into careminsterMelanie2013-06-111-2/+3
|\ \ | |/
| * * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ...teravus2013-06-111-2/+3
* | Merge branch 'master' into careminsterMelanie2013-06-071-1/+2
|\ \ | |/
| * Fix regression where multiple close agents could be sent to the wrong neighbo...Justin Clark-Casey (justincc)2013-06-071-1/+6
* | Merge branch 'master' into careminsterMelanie2013-06-061-3/+26
|\ \ | |/
| * Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| * Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-065-0/+64
| * Committing Avination's Keyframe module. This is not hooked up yet and will do...Melanie2013-06-061-0/+766
| * Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Script...Justin Clark-Casey (justincc)2013-06-051-11/+21
* | Merge branch 'avination-current' into careminsterMelanie2013-06-066-2/+76
|\ \
| * | Unsit seated avatars when an object is deletedMelanie2013-06-021-0/+8
| * | Stop sending velocity to avoid snap-backMelanie2013-05-311-1/+1
| * | Allow Linden trees to preserve their type when taken into inventory and rezze...Melanie2013-05-261-0/+5
| * | Port fix from justicc - decouple pay prices on drag-copied primsMelanie2013-05-241-0/+1
| * | Small adjustments to the floater moduleMelanie2013-05-131-1/+1
| * | Guard against trying to access terrain heights out of bounds. Clamp to sim.Melanie2013-05-111-1/+9
| * | Refactor to get closer to coreMelanie2013-05-111-1/+1
| * | Add RegionManager level and the ability to use literal XML to the dynamic flo...Melanie2013-05-042-0/+2
| * | Controller module for dynamic floaters (WIP)Melanie2013-04-271-0/+51
| * | Adding the dynamic menu module which allows registering new menu options in c...Melanie2013-04-251-0/+57
* | | Merge branch 'master' into careminsterMelanie2013-06-046-6/+184
|\ \ \ | | |/ | |/|
| * | Trigger OnScenePresenceUpdated when the avatar's animations change.Robert Adams2013-05-302-4/+21
| * | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-302-0/+136
| * | Add region heartbeat start event to complement heartbeat end event.Robert Adams2013-05-302-0/+25
| * | If on a sit request we sit the avatar on a different prim in a linkset for so...Justin Clark-Casey (justincc)2013-05-301-3/+3
* | | Merge branch 'master' into careminsterMelanie2013-05-302-3/+10
|\ \ \ | |/ /
| * | Try caching the user name for a new agent earlier on in the process of establ...Justin Clark-Casey (justincc)2013-05-291-3/+9
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-284-4/+22
| |\ \
| | * | One more appearance change: drop sending the SendAppearance packetMic Bowman2013-05-241-1/+3
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-205-15/+11
| |\ \ \
| * | | | Add commentDiva Canto2013-05-201-0/+2
* | | | | Merge branch 'master' into careminsterMelanie2013-05-242-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()Justin Clark-Casey (justincc)2013-05-241-1/+0
| * | | | Fix issue where llSetPayPrice on either one of a clone prim in the same OpenS...Justin Clark-Casey (justincc)2013-05-241-0/+2
| * | | | Fix bug where a cloned object would report the wrong llGetNumberOfPrims() whe...Justin Clark-Casey (justincc)2013-05-231-0/+1
* | | | | Merge branch 'master' into careminsterMelanie2013-05-242-1/+14
|\ \ \ \ \ | |/ / / /