aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-182-3/+20
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-182-37/+18
| |\
| | * Remove extraneous calls to the now commented CheckSculptAndLoadMelanie2012-10-181-24/+0
| | * extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| | * [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-182-14/+18
| * | Add number of inventory items to information displayed via "show part" consol...Justin Clark-Casey (justincc)2012-10-182-3/+20
| |/
* | Merge branch 'avination' into careminsterMelanie2012-10-183-23/+36
|\ \
| * \ Merge branch 'ubitwork' into avinationMelanie2012-10-173-23/+36
| |\ \
| | * | normalize quaternion.Slerp outputsUbitUmarov2012-10-102-0/+2
| | * | bug fix + make costs visible for testingUbitUmarov2012-10-071-4/+9
| | * | [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-072-19/+23
| | * | Merge branch 'avination' into ubitworkUbitUmarov2012-10-052-16/+29
| | |\ \
| | * | | meshworker basic replacement of SOP CheckSculptAndLoad ( for now disabledUbitUmarov2012-10-031-0/+2
* | | | | Merge branch 'avination' into careminsterMelanie2012-10-174-14/+37
|\ \ \ \ \ | |/ / / /
| * | | | Fix perms when linking an object. Set root part perms to the permsMelanie2012-10-144-14/+29
| * | | | Change permissions on child prim inventory items when god mode "forceMelanie2012-10-082-2/+10
| | |/ / | |/| |
| * | | Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-10-161-2/+3
|\ \ \ | | |/ | |/|
| * | minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-161-2/+3
* | | Merge branch 'master' into careminsterMelanie2012-10-123-215/+316
|\ \ \ | |/ /
| * | Get rid of accidental scene start left in ScenePresenceAutopilotTestsJustin Clark-Casey (justincc)2012-10-121-1/+0
| * | Fix problems with regression tests by allowing invoke of Update() with a fini...Justin Clark-Casey (justincc)2012-10-122-3/+5
| * | Add "active true|false" to "debug scene" console command.Justin Clark-Casey (justincc)2012-10-121-3/+37
| * | minor: Add method doc to EventManager.OnNewClient, OnClientLogin, ClientClose...Justin Clark-Casey (justincc)2012-10-101-0/+14
| * | Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to preve...Justin Clark-Casey (justincc)2012-10-101-201/+256
| * | minor: elaborate method doc on Scene.NewUserConnection()Justin Clark-Casey (justincc)2012-10-091-6/+13
| * | Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2012-10-081-1/+1
| |\ \
| * | | Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full ...Dan Lake2012-10-052-5/+5
| * | | Trigger ObjectAddedToScene when loading objects from oarfile. Already trigger...Dan Lake2012-10-051-1/+8
* | | | Fix merge issuesMelanie2012-10-071-7/+0
* | | | Merge branch 'master' into careminsterMelanie2012-10-072-2/+29
|\ \ \ \ | | |/ / | |/| |
| * | | On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-1/+1
| |/ /
| * | minor: Add missing license information from the top of IUserManagementJustin Clark-Casey (justincc)2012-10-051-1/+28
| * | Forgot to actually remove the packetpool set code from scene.Justin Clark-Casey (justincc)2012-10-051-7/+0
* | | Merge branch 'master' into careminsterMelanie2012-10-043-16/+62
|\ \ \ | |/ /
| * | Allow default animation to be stopped to be replaced with another one.Melanie2012-10-042-16/+29
| * | Add generic PercentageStat.Justin Clark-Casey (justincc)2012-10-041-1/+1
| * | Add experimental "slow frames" stat, available in "show stats" and via the mo...Justin Clark-Casey (justincc)2012-10-041-0/+33
* | | Merge branch 'master' into careminsterMelanie2012-10-032-0/+15
|\ \ \ | |/ /
| * | implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-0/+9
| * | Prevent the ExtraSettings code from crashing SQLite driven sims.Melanie2012-10-021-0/+6
| * | Add MaxPrimsUndo config setting to [Startup] section of OpenSim.ini.Justin Clark-Casey (justincc)2012-09-275-19/+12
| * | Don't store undo states if a scene object is manipulated when it is not in a ...Justin Clark-Casey (justincc)2012-09-262-3/+26
| * | refactor: Change control structures in SOP.StoreUndoState() to reduce nesting.Justin Clark-Casey (justincc)2012-09-261-45/+43
| * | Make it possible to rescale SOGs when they are not in a scene.Justin Clark-Casey (justincc)2012-09-262-34/+40
| * | Enforce existing 5 action hardcoded undo limit.Justin Clark-Casey (justincc)2012-09-263-27/+65
| * | Add basic undo/redo regression tests.Justin Clark-Casey (justincc)2012-09-263-8/+137
* | | Merge branch 'avination' into careminsterMelanie2012-09-274-10/+21
|\ \ \ | | |/ | |/|
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-4/+15
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-241-1/+1
| |\ \