Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-17 | 6 | -10/+332 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-15 | 1 | -1/+4 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-05-15 | 0 | -0/+0 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | Add another null check to Melanie's last commit. Seems to eliminate sqlite er... | dahlia | 2012-05-14 | 1 | -1/+1 | |
| | | * | | | | | | | | | | | | | | | | | Guard against null root part on SQLite. This really needs to be fixed so SQLite | Melanie | 2012-05-15 | 1 | -1/+1 | |
| | | |/ / / / / / / / / / / / / / / / | ||||||
| | | * | | | | | | | | | | | | | | | | Try to fix sqlite breakage | Melanie | 2012-05-15 | 1 | -0/+3 | |
| | | * | | | | | | | | | | | | | | | | Port Avination's collision fixes to core. | Melanie | 2012-05-15 | 5 | -523/+199 | |
| | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-14 | 6 | -525/+195 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-14 | 14 | -90/+344 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Save the Telehub and its Spawn Points in the OAR | Oren Hurvitz | 2012-05-14 | 6 | -5/+100 | |
| | | * | | | | | | | | | | | | | | | | set executable bit for Ionic.Zip.dll for running OpenSimulator under cygwin | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -0/+0 | |
| | | * | | | | | | | | | | | | | | | | minor: add explanative comment to 'missing baked texture' logging commonly se... | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -0/+10 | |
| | | * | | | | | | | | | | | | | | | | minor: comment out individual attachment transfer log messages for now | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -4/+4 | |
| | | * | | | | | | | | | | | | | | | | Set the agent in transit teleport flag at the first available opportunity (i.... | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -11/+37 | |
| | | * | | | | | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-14 | 5 | -67/+188 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | | | | | | | | Oops - missed the config changes | BlueWall | 2012-05-14 | 1 | -0/+8 | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'master' of /home/opensim/src/OpenSim | BlueWall | 2012-05-13 | 3 | -29/+34 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * | | | | | | | | | | | | | | | | Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ... | Chris Koeritz | 2012-05-13 | 3 | -29/+34 | |
| | | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-05-13 | 1 | -1/+1 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | ||||||
| | | | * | | | | | | | | | | | | | | | | | Add configurable SpawnPointRouting | BlueWall | 2012-05-13 | 2 | -38/+146 | |
| | | * | | | | | | | | | | | | | | | | | | Add more region information to some teleport related logging | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -7/+8 | |
| | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 11 | -29/+129 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 3 | -106/+163 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-13 | 9 | -32/+444 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Fix mono compiler warning. | Justin Clark-Casey (justincc) | 2012-05-12 | 1 | -1/+1 | |
| | | | |_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Revert "Save the Telehub and its Spawn Points in the OAR" | Justin Clark-Casey (justincc) | 2012-05-12 | 6 | -100/+5 | |
| | | * | | | | | | | | | | | | | | | | | | Save the Telehub and its Spawn Points in the OAR | Oren Hurvitz | 2012-05-10 | 6 | -5/+100 | |
| | | * | | | | | | | | | | | | | | | | | | Print out more information on connecting bots | Justin Clark-Casey (justincc) | 2012-05-11 | 2 | -9/+19 | |
| | | * | | | | | | | | | | | | | | | | | | Increase minimum period between bot actions to 3 seconds, so that teleport do... | Justin Clark-Casey (justincc) | 2012-05-11 | 1 | -2/+2 | |
| | | * | | | | | | | | | | | | | | | | | | Stagger multiple bot logins by 5 seconds to make this part of the test more '... | Justin Clark-Casey (justincc) | 2012-05-11 | 1 | -0/+13 | |
| | | * | | | | | | | | | | | | | | | | | | Do bot startup on another thread so console is responsive during this process | Justin Clark-Casey (justincc) | 2012-05-11 | 2 | -1/+5 | |
| | | * | | | | | | | | | | | | | | | | | | Do each bot shutdown on its own threads to prevent one slow shutdown holding ... | Justin Clark-Casey (justincc) | 2012-05-11 | 1 | -8/+13 | |
| | | * | | | | | | | | | | | | | | | | | | Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, C... | Justin Clark-Casey (justincc) | 2012-05-11 | 2 | -5/+22 |