aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2014-01-283-7/+7
|\
| * Materials module: a) Store materials as assets; b) Finalized it (removed the ...Oren Hurvitz2014-01-202-6/+6
| * minor: since structs are values, assigning them to another variable copies it...Justin Clark-Casey (justincc)2014-01-171-1/+1
* | Merge branch 'master' into careminsterMelanie2014-01-281-24/+35
|\ \ | |/
| * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-60/+55
| |\
| | * When creating a coalesced object, set its permissions to the lowest-common-de...Oren Hurvitz2014-01-101-7/+16
| | * When creating a coalesced object, set its Creator ID if all the objects have ...Oren Hurvitz2014-01-101-4/+15
| | * Refactored: use a single function to apply an object's folded permissions to ...Oren Hurvitz2014-01-101-11/+9
| | * Refactored setting permissions when rezzing items: use the same function when...Oren Hurvitz2014-01-101-37/+14
* | | Intermediate commit. Sill errors.Melanie2014-01-051-12/+23
|\ \ \ | |/ /
| * | Some missing definitions needed for successful compilation.Robert Adams2014-01-041-1/+2
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-11/+21
| * | This is the Avination Entity Transfer Module. Surprisingly, it still compilesMelanie2013-12-111-217/+204
| |/
* | Merge branch 'master' into careminsterMelanie2013-11-232-3/+3
|\ \ | |/
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-152-3/+3
* | Merge branch 'master' into careminsterMelanie2013-11-031-64/+10
|\ \ | |/
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-151-43/+8
* | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-051-2/+6
* | Merge branch 'master' into careminsterMelanie2013-10-044-20/+85
|\ \ | |/
| * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ...Justin Clark-Casey (justincc)2013-09-271-4/+4
| * minor: correct attachment spelling mistake in log message in HGEntityTransfer...Justin Clark-Casey (justincc)2013-09-261-1/+1
| * minor: log MaxOutgoingTransferVersion at EntityTransferModule startupJustin Clark-Casey (justincc)2013-09-261-0/+4
| * Move adding UUID.Zero -> Unknown User binding to UMM.Init() so that it's also...Justin Clark-Casey (justincc)2013-09-251-2/+1
| * Preserve attachment point & position when attachment is rezzed in worldAleric Inglewood2013-09-221-0/+8
| * Make UUID.Zero resolve to "Unknown User" in user cache.Justin Clark-Casey (justincc)2013-09-201-0/+2
| * For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 t...Justin Clark-Casey (justincc)2013-09-191-4/+49
| * Reinstate insertion of "Unknown UserUMMAU4" now, as naive removing may be gen...Justin Clark-Casey (justincc)2013-09-171-35/+31
| * Comment out warning about no grid user found in UMM.TryGetUserNamesFromServic...Justin Clark-Casey (justincc)2013-09-171-4/+4
| * Fix issue in recent 3f0fa9f7 where the code start adding unknown user cache e...Justin Clark-Casey (justincc)2013-09-171-2/+3
| * To avoid viewers (particularly on the Hypergrid) from permanently caching a U...Justin Clark-Casey (justincc)2013-09-161-35/+42
| * Allow setting the EntityTransfer-max_distance to 0 to override distance check...BlueWall2013-09-121-0/+3
* | Merge branch 'master' into careminsterMelanie2013-09-072-4/+17
|\ \ | |/
| * Restore group membership check for HG users in QueryAccess.Diva Canto2013-09-051-4/+10
| * Fix bug where users teleporting to non-neighbour regions could continue to he...Justin Clark-Casey (justincc)2013-09-021-0/+7
* | Merge branch 'master' into careminsterMelanie2013-09-011-4/+4
|\ \ | |/
| * minor: shortern warning messages in EntityTransferModule when UpdateAgent() f...Justin Clark-Casey (justincc)2013-08-231-4/+4
* | Merge branch 'master' into careminsterMelanie2013-08-171-25/+22
|\ \ | |/
| * Try to make "slow down" message that one could receive on rapid teleporting m...Justin Clark-Casey (justincc)2013-08-151-1/+2
| * Move DoNotCloseAfterTeleport flag reset before UpdateAgent in V2 to avoid a l...Justin Clark-Casey (justincc)2013-08-151-2/+6
| * Rely on the Scene.IncomingCloseAgent() check as to whether the connection sho...Justin Clark-Casey (justincc)2013-08-151-14/+6
| * Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.Justin Clark-Casey (justincc)2013-08-151-12/+12
* | Merge branch 'master' into careminsterMelanie2013-08-111-11/+19
|\ \ | |/
| * Comment back out seed dump code enabled in b1c26a56. Also adds a few telepor...Justin Clark-Casey (justincc)2013-08-091-16/+22
| * Fix an issue where under teleport v2 protocol, teleporting from regions in an...Justin Clark-Casey (justincc)2013-08-081-23/+25
* | Merge branch 'master' into careminsterMelanie2013-08-073-6/+73
|\ \ | |/
| * minor: add some method doc to ScenePresence fields used for entity transfer, ...Justin Clark-Casey (justincc)2013-08-071-5/+9
| * Add post-CreateAgent teleport cancellation/abortion functionality from v1 tra...Justin Clark-Casey (justincc)2013-08-071-0/+21
| * More on HG inventory and OutboundPermission: disallowing giving inventory to ...Diva Canto2013-08-031-1/+12
| * HG: If OutboundPermission is set to false, let's enforce stricter permissions...Diva Canto2013-08-031-0/+31
| * minor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in Inventory...Justin Clark-Casey (justincc)2013-08-021-1/+1