| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | | let objects/avas push avas | UbitUmarov | 2012-04-24 | 1 | -2/+1 |
| * | | | | | "save the catgirls" | UbitUmarov | 2012-04-24 | 2 | -18/+13 |
| * | | | | | display heatbeat sleep time in stats. This may not be good for general use, ... | UbitUmarov | 2012-04-24 | 1 | -0/+5 |
| * | | | | | fix Simulation time report | UbitUmarov | 2012-04-24 | 1 | -0/+7 |
| * | | | | | some reduction on time resolution efects on spare time report | UbitUmarov | 2012-04-24 | 1 | -4/+8 |
| * | | | | | *testing* changed stats time reports to be per reported frame and not acumul... | UbitUmarov | 2012-04-24 | 1 | -11/+64 |
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 0 | -0/+0 |
|\ \ \ \ \ \
| | |_|/ / /
| |/| | | | |
|
| * | | | | | Port Avination link order to make OpenSim behave like SL. Make Primstar scrip... | Melanie | 2012-04-25 | 2 | -7/+47 |
| | |/ / /
| |/| | | |
|
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -15/+24 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2012-04-25 | 50 | -801/+1393 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Add try/catch around Json script method registration to avoild some issues | Mic Bowman | 2012-04-25 | 1 | -15/+24 |
* | | | | | Adapt some TeleportWithMomentum calls | Melanie | 2012-04-25 | 2 | -2/+2 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 3 | -19/+15 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Slight rewording of output messages. | Diva Canto | 2012-04-24 | 1 | -1/+1 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-04-24 | 2 | -1/+13 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-04-25 | 1 | -0/+1 |
| | |\ \ \ \ |
|
| | | * | | | | zero out SP velocity before calling SP.Teleport(), as the client expects (tho... | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -0/+1 |
| | * | | | | | Commit the avination Teleport() methods (adaptedto justincc's changes) | Melanie | 2012-04-25 | 1 | -1/+12 |
| | |/ / / / |
|
| * | | | | | HG: Moved User-level code down to the HGEntityTransferModule where it belongs. | Diva Canto | 2012-04-24 | 2 | -14/+14 |
| |/ / / / |
|
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 5 | -11/+40 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum() | Justin Clark-Casey (justincc) | 2012-04-25 | 2 | -17/+1 |
| * | | | | Add regression test TestSameRegionTeleport() | Justin Clark-Casey (justincc) | 2012-04-25 | 3 | -1/+43 |
| * | | | | Comment out AvatarService.SetAvatar debug log line for now | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -1/+1 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 8 | -55/+76 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Comment out some debug ATTACHMENTS log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -15/+14 |
| * | | | | Comment out the noisier AVFACTORY log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -4/+6 |
| * | | | | Improve teleport log debug and error messages to tell us who is teleporting. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+14 |
| * | | | | Go back to always using the local timezone for now - not all machines have US... | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -13/+18 |
| * | | | | Revert "Refactored how asset/inventory types are associated with content type... | Justin Clark-Casey (justincc) | 2012-04-24 | 2 | -177/+228 |
| * | | | | Minor improvements to logging | Oren Hurvitz | 2012-04-24 | 6 | -12/+24 |
| * | | | | Refactored how asset/inventory types are associated with content types: gathe... | Oren Hurvitz | 2012-04-24 | 2 | -228/+177 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 15 | -355/+298 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Fixed problem with MySQL: it was possible for one thread to use an incomplete... | Oren Hurvitz | 2012-04-24 | 3 | -21/+37 |
| * | | | | When reading a region, use null objects to represent NULL fields. | Oren Hurvitz | 2012-04-24 | 1 | -1/+5 |
| * | | | | OSSL: fixed the threat level check for osParseJSONNew | Oren Hurvitz | 2012-04-24 | 1 | -1/+1 |
| * | | | | minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), chief... | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -1/+6 |
| * | | | | DST settings to match client default Pacific Time (mantis #5972) | Olivier van Helden and Gudule Lapointe (Speculoos.net) | 2012-04-24 | 1 | -1/+15 |
| * | | | | Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ... | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -0/+1 |
| * | | | | Changed the Map-related messages from Info to Debug. They're debug messages. | Diva Canto | 2012-04-23 | 4 | -8/+8 |
| * | | | | Add online/offline indicator to "friends show" region console command. | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -3/+14 |
| * | | | | Add osForceAttachToAvatar() and osForceDetachFromAvatar() | Justin Clark-Casey (justincc) | 2012-04-24 | 6 | -49/+127 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-23 | 6 | -58/+120 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Replace common code to fetch self inventory item (as opposed to uuid) with Ge... | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -155/+76 |
| * | | | | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_Api | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -94/+42 |
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2012-04-23 | 7 | -502/+617 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | ubitODE - do own timing control (as chODE does) until heartbeat does it right | UbitUmarov | 2012-04-23 | 2 | -21/+34 |
| * | | | | ubitODE - several changes... | UbitUmarov | 2012-04-23 | 3 | -431/+379 |
| * | | | | fix a bug i added fixing another.... | UbitUmarov | 2012-04-22 | 1 | -2/+5 |
| * | | | | ubitODE: - don't try to hover underground unless volumedetector (that doesn't... | UbitUmarov | 2012-04-21 | 1 | -47/+93 |
| * | | | | changed seletion code. SOP now knows about parts selection. UI actions are se... | UbitUmarov | 2012-04-20 | 3 | -24/+104 |