aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-064-143/+1
|\
| * Remove long unused Scene.DumpAssetsToFile boolean.Justin Clark-Casey (justincc)2013-02-061-5/+0
| * Remove very long unused IScriptHost and NullScriptHostJustin Clark-Casey (justincc)2013-02-063-138/+1
* | Merge branch 'master' into careminsterMelanie2013-02-064-168/+107
|\ \ | |/
| * Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region....Justin Clark-Casey (justincc)2013-02-063-168/+0
| * Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would retu...Justin Clark-Casey (justincc)2013-02-061-15/+0
| * refactor: Move functions that lookup asset ids from task inventory or pass th...Justin Clark-Casey (justincc)2013-02-061-0/+122
* | Merge branch 'master' into careminsterMelanie2013-02-053-1/+24
|\ \ | |/
| * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-052-1/+24
| |\
| | * Added DynAttrs to the serialized XML format of prims. When copying prims, use...Oren Hurvitz2013-01-252-0/+16
| | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-251-2/+2
| | * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-251-1/+8
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-042-5/+10
|\ \ \ | |/ /
| * | minor: change comment about assuming script references are textures in UuidGa...Justin Clark-Casey (justincc)2013-02-021-1/+2
| * | Log missing assets on "fcache assets" found. This ignores references found b...Justin Clark-Casey (justincc)2013-02-021-2/+5
| * | Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.teravus2013-02-011-2/+3
* | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\ \ \ | |/ /
| * | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
* | | Merge branch 'avination' into careminsterMelanie2013-01-311-226/+229
|\ \ \
| * | | Change keyframe motion to use a single timer for all objects. This is requiredMelanie2013-01-301-236/+229
| * | | Send moving_end event to scripts when keyframed motion ends.Melanie2013-01-271-0/+10
* | | | Merge branch 'master' into careminsterMelanie2013-01-311-108/+106
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-01-301-0/+1
| |\ \ \
| * | | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ...Jak Daniels2013-01-301-1/+6
* | | | | Merge branch 'master' into careminsterMelanie2013-01-312-0/+122
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-301-0/+1
| |/ / /
| * | | * This adds a bit more to the previous flying roll effect by adding additiona...teravus2013-01-301-10/+50
| * | | * Adds a satisfying angular roll when an avatar is flying and turning. (Gene...teravus2013-01-301-0/+81
* | | | Merge branch 'avination' into careminsterMelanie2013-01-271-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-6/+7
| * | | Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-262-2/+2
| * | | Stop temp-on-rez object from being deleted while an avatar sits on themMelanie2013-01-261-1/+1
* | | | Merge branch 'master' into careminsterMelanie2013-01-271-6/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-5/+6
* | | | Merge branch 'master' into careminsterMelanie2013-01-261-0/+56
|\ \ \ \ | |/ / /
| * | | Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so th...Justin Clark-Casey (justincc)2013-01-261-0/+56
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-01-251-0/+1
|\ \ \ | |/ /
| * | * This makes the non-physics llCastRay 'better'. It's not 'correctly work...teravus2013-01-231-0/+1
| * | Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+13
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \ \ | | |/ | |/|
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-2/+2
* | | Merge branch 'avination' into careminsterMelanie2013-01-232-10/+30
|\ \ \ | |/ /
| * | Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| * | Limit active at targets to 8Melanie2013-01-211-2/+6
| * | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-01-232-1/+3
|\ \ \
| * \ \ Merge branch 'avination'Melanie2013-01-192-1/+3
| |\ \ \ | | |/ /
| | * | dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-162-1/+3
* | | | Merge branch 'master' into careminsterMelanie2013-01-232-14/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|