aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-194-176/+243
|\
| * Improve locking of RegionCombinerModule.m_regionsJustin Clark-Casey (justincc)2012-05-191-24/+29
| * Add size of region to OAR control file. Megaregions (sw root OARs when saved...Justin Clark-Casey (justincc)2012-05-193-17/+56
| * refactor: Add RegionConnection.PosX and PosY to return position in meters rat...Justin Clark-Casey (justincc)2012-05-192-30/+43
| * refactor: Rename connection paramaters from "conn" and "regionConnections" so...Justin Clark-Casey (justincc)2012-05-191-127/+133
| * Correct some log messages in RegionCombinerModule about the position of the r...Justin Clark-Casey (justincc)2012-05-191-5/+3
| * Make the megaregion total area given to the physics module accurate instead o...Justin Clark-Casey (justincc)2012-05-191-3/+9
* | Merge branch 'master' into careminsterMelanie2012-05-1915-130/+388
|\ \ | |/
| * Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ...Justin Clark-Casey (justincc)2012-05-193-20/+5
| * Add some method doc to RegionCombinerModule. Clean up log messages.Justin Clark-Casey (justincc)2012-05-191-10/+29
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-192-8/+6
| |\
| | * Further refinement on propertiesBlueWall2012-05-181-7/+4
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-182-8/+13
| | |\
| | * | Cleanup + change properties to set fields with private set : Thanks Justin fo...BlueWall2012-05-182-3/+4
| * | | Add is_megaregion flag into oar control file. Not currently read - for futur...Justin Clark-Casey (justincc)2012-05-194-43/+145
| | |/ | |/|
| * | Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This ...Justin Clark-Casey (justincc)2012-05-191-5/+4
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-183-1/+14
| |\ \ | | |/
| | * Provide Telehub setting to allow use of landmarksBlueWall2012-05-183-1/+14
| * | Fix issue where a new outfit folder is not created when a new outfit is saved...Justin Clark-Casey (justincc)2012-05-181-3/+9
| |/
| * Fix build break. Comment out EQG deregister/register logging.Justin Clark-Casey (justincc)2012-05-181-10/+10
| * Add millisecond logging to pCampBot for debugging purposesJustin Clark-Casey (justincc)2012-05-181-1/+1
| * Add level 2 debug eq logging which logs event queue polls.Justin Clark-Casey (justincc)2012-05-181-23/+32
| * Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte log...Justin Clark-Casey (justincc)2012-05-181-0/+3
| * refactor: move EventQueueGet path generation into common method. Rename some...Justin Clark-Casey (justincc)2012-05-182-21/+34
| * Don't eagerly clear frame collision events when physics actors subscribe and ...Justin Clark-Casey (justincc)2012-05-171-2/+8
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-172-31/+30
| |\
| * | Check agent limit against root agent count rather than both root and child ag...Justin Clark-Casey (justincc)2012-05-173-22/+43
* | | Merge branch 'avination' into careminsterMelanie2012-05-176-10/+332
|\ \ \
| * | | udp transfer: make number packets estimation coerent with number actually sen...UbitUmarov2012-05-171-2/+8
| * | | trigger collision sounds on active agent position for better spatial effect ...UbitUmarov2012-05-172-23/+22
| * | | increase avatars collisions report to 10 per sec, Stopped sound on avatar to ...UbitUmarov2012-05-172-2/+2
| * | | add avatar colision sounds. Changed test sound UUIDUbitUmarov2012-05-172-62/+120
| * | | default colisionVolume is 0, use it only for user specified soundUbitUmarov2012-05-171-3/+6
| * | | default collision sounds. Incomplete, untested, needs revisionUbitUmarov2012-05-172-1/+205
| * | | collision sounds: simplify send code a bit and limit sending rate to 5 per s...UbitUmarov2012-05-161-1/+36
| * | | Added a invalidCollisionSoundUUID so that scripts can stop all collision sou...UbitUmarov2012-05-163-6/+23
* | | | Merge branch 'master' into careminsterMelanie2012-05-176-44/+198
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-05-171-29/+28
| |\ \ \
| | * | | Force the default Telehub router if no matches are found in the config.BlueWall2012-05-171-29/+28
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-05-161-0/+67
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFai...Justin Clark-Casey (justincc)2012-05-171-1/+1
| | * | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()Justin Clark-Casey (justincc)2012-05-171-0/+67
| | |/ /
| * | | Fix boo-boo in OpenSim.ini.example affecting telehub sequential routingBlueWall2012-05-161-2/+2
| |/ /
| * | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression te...Justin Clark-Casey (justincc)2012-05-172-2/+8
| * | minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator bec...Justin Clark-Casey (justincc)2012-05-171-8/+6
| * | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()Justin Clark-Casey (justincc)2012-05-172-1/+77
| * | Remove redundant "Teleport failed:" from reason when QueryAccess fails for th...Justin Clark-Casey (justincc)2012-05-171-4/+12
* | | Merge branch 'master' into careminsterMelanie2012-05-168-219/+282
|\ \ \ | |/ /
| * | Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format...Justin Clark-Casey (justincc)2012-05-163-115/+5
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-05-155-523/+202
| |\ \