| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-05-19 | 15 | -130/+388 |
|\ |
|
| * | Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be ... | Justin Clark-Casey (justincc) | 2012-05-19 | 3 | -20/+5 |
| * | Add some method doc to RegionCombinerModule. Clean up log messages. | Justin Clark-Casey (justincc) | 2012-05-19 | 1 | -10/+29 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-19 | 2 | -8/+6 |
| |\ |
|
| | * | Further refinement on properties | BlueWall | 2012-05-18 | 1 | -7/+4 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-05-18 | 2 | -8/+13 |
| | |\ |
|
| | * | | Cleanup + change properties to set fields with private set : Thanks Justin fo... | BlueWall | 2012-05-18 | 2 | -3/+4 |
| * | | | Add is_megaregion flag into oar control file. Not currently read - for futur... | Justin Clark-Casey (justincc) | 2012-05-19 | 4 | -43/+145 |
| | |/
| |/| |
|
| * | | Enable FetchInventoryDescendents2 and FetchInventory2 caps by default. This ... | Justin Clark-Casey (justincc) | 2012-05-19 | 1 | -5/+4 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-18 | 3 | -1/+14 |
| |\ \
| | |/ |
|
| | * | Provide Telehub setting to allow use of landmarks | BlueWall | 2012-05-18 | 3 | -1/+14 |
| * | | Fix issue where a new outfit folder is not created when a new outfit is saved... | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -3/+9 |
| |/ |
|
| * | Fix build break. Comment out EQG deregister/register logging. | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -10/+10 |
| * | Add millisecond logging to pCampBot for debugging purposes | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -1/+1 |
| * | Add level 2 debug eq logging which logs event queue polls. | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -23/+32 |
| * | Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte log... | Justin Clark-Casey (justincc) | 2012-05-18 | 1 | -0/+3 |
| * | refactor: move EventQueueGet path generation into common method. Rename some... | Justin Clark-Casey (justincc) | 2012-05-18 | 2 | -21/+34 |
| * | Don't eagerly clear frame collision events when physics actors subscribe and ... | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -2/+8 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-17 | 2 | -31/+30 |
| |\ |
|
| * | | Check agent limit against root agent count rather than both root and child ag... | Justin Clark-Casey (justincc) | 2012-05-17 | 3 | -22/+43 |
* | | | Merge branch 'avination' into careminster | Melanie | 2012-05-17 | 6 | -10/+332 |
|\ \ \ |
|
| * | | | udp transfer: make number packets estimation coerent with number actually sen... | UbitUmarov | 2012-05-17 | 1 | -2/+8 |
| * | | | trigger collision sounds on active agent position for better spatial effect ... | UbitUmarov | 2012-05-17 | 2 | -23/+22 |
| * | | | increase avatars collisions report to 10 per sec, Stopped sound on avatar to ... | UbitUmarov | 2012-05-17 | 2 | -2/+2 |
| * | | | add avatar colision sounds. Changed test sound UUID | UbitUmarov | 2012-05-17 | 2 | -62/+120 |
| * | | | default colisionVolume is 0, use it only for user specified sound | UbitUmarov | 2012-05-17 | 1 | -3/+6 |
| * | | | default collision sounds. Incomplete, untested, needs revision | UbitUmarov | 2012-05-17 | 2 | -1/+205 |
| * | | | collision sounds: simplify send code a bit and limit sending rate to 5 per s... | UbitUmarov | 2012-05-16 | 1 | -1/+36 |
| * | | | Added a invalidCollisionSoundUUID so that scripts can stop all collision sou... | UbitUmarov | 2012-05-16 | 3 | -6/+23 |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-05-17 | 6 | -44/+198 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Merge branch 'master' of /home/opensim/lib/osgrid/opensim | BlueWall | 2012-05-17 | 1 | -29/+28 |
| |\ \ \ |
|
| | * | | | Force the default Telehub router if no matches are found in the config. | BlueWall | 2012-05-17 | 1 | -29/+28 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-05-16 | 1 | -0/+67 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| | * | | | minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFai... | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -1/+1 |
| | * | | | Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails() | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -0/+67 |
| | |/ / |
|
| * | | | Fix boo-boo in OpenSim.ini.example affecting telehub sequential routing | BlueWall | 2012-05-16 | 1 | -2/+2 |
| |/ / |
|
| * | | Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression te... | Justin Clark-Casey (justincc) | 2012-05-17 | 2 | -2/+8 |
| * | | minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator bec... | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -8/+6 |
| * | | Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails() | Justin Clark-Casey (justincc) | 2012-05-17 | 2 | -1/+77 |
| * | | Remove redundant "Teleport failed:" from reason when QueryAccess fails for th... | Justin Clark-Casey (justincc) | 2012-05-17 | 1 | -4/+12 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-05-16 | 8 | -219/+282 |
|\ \ \
| |/ / |
|
| * | | Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format... | Justin Clark-Casey (justincc) | 2012-05-16 | 3 | -115/+5 |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-15 | 5 | -523/+202 |
| |\ \ |
|
| * | | | Fix issue where loading OARs could sometimes result in link numbers being reo... | Justin Clark-Casey (justincc) | 2012-05-15 | 4 | -6/+72 |
| * | | | Allow use of regular expressions in "show object name", "show part name" and ... | Justin Clark-Casey (justincc) | 2012-05-15 | 2 | -101/+208 |
* | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-15 | 5 | -64/+204 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coeren... | UbitUmarov | 2012-05-15 | 1 | -2/+5 |
| * | | | sop colisions don't play sounds on volume detectors | UbitUmarov | 2012-05-15 | 1 | -1/+1 |
| * | | | sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision... | UbitUmarov | 2012-05-15 | 1 | -48/+118 |
| * | | | ubitODE: if stopped having collisions do report zero colisions once, so colli... | UbitUmarov | 2012-05-15 | 2 | -9/+43 |