| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-02-05 | 2 | -3/+4 |
|\ |
|
| * | Revert my two quick fixes for the lag issue and put in the real fix, which | Melanie | 2012-02-05 | 1 | -1/+2 |
| * | Revert "Remove checks on ban list expiry on every move. To be re-added on par... | Melanie | 2012-02-05 | 1 | -4/+4 |
| * | Revert "Check ban list for a particular parcel only when an avatar moves into... | Melanie | 2012-02-05 | 2 | -17/+4 |
| * | Check ban list for a particular parcel only when an avatar moves into it. | Melanie | 2012-02-05 | 2 | -4/+17 |
| * | Remove checks on ban list expiry on every move. To be re-added on parcel | Melanie | 2012-02-05 | 1 | -4/+4 |
| * | Quiet the map module logging | BlueWall | 2012-02-04 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 4 | -8/+10 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-02-04 | 1 | -0/+2 |
| |\ |
|
| | * | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-02-03 | 1 | -0/+2 |
| | |\ |
|
| | | * | Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i... | PixelTomsen | 2012-02-03 | 1 | -0/+2 |
| * | | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ... | Snoopy Pfeffer | 2012-02-03 | 3 | -8/+8 |
| |/ / |
|
| * | | Corrected console help texts for "save iar" | Snoopy Pfeffer | 2012-02-03 | 1 | -2/+2 |
| |/ |
|
| * | Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more | Melanie | 2012-02-02 | 2 | -26/+62 |
* | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 2 | -27/+57 |
* | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 1 | -183/+29 |
* | | Rehook the eject and freeze events that had gotten unhooked in the merge | Melanie | 2012-02-02 | 1 | -0/+2 |
* | | Fix remembering attachment point and position when an item is rezzed in world. | Melanie | 2012-02-02 | 1 | -0/+12 |
* | | Re-Add the reading of attachment data hat was lost in the merge | Melanie | 2012-02-02 | 1 | -1/+46 |
* | | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 3 | -28/+230 |
|\ \
| |/ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-01 | 2 | -17/+221 |
| |\ |
|
| | * | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri... | Diva Canto | 2012-01-31 | 1 | -1/+1 |
| | * | Add "show part uuid" and "show part name" console commands. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -7/+97 |
| | * | Implement "show object name <name>" console command to show details of an obj... | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -8/+49 |
| | * | Get rid of the "no objects found" feedback for now - this doesn't work well i... | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -11/+13 |
| | * | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -5/+56 |
| | * | Add more user feedback if an object isn't found for which delete was requested. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+15 |
| | * | Add the name of a deleted object to the console output | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 |
| | * | If a particular region is selected in the console, only try to delete objects... | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -16/+21 |
| * | | Prevent a changed attachment that has been saved from being saved again. | Melanie | 2012-02-01 | 1 | -0/+1 |
| * | | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 1 | -11/+8 |
| |/ |
|
* | | Merge branch 'master' into careminster | Melanie | 2012-01-31 | 1 | -0/+206 |
|\ \
| |/ |
|
| * | Move object delete commands into a commands region module, in preparation for... | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+206 |
| * | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 1 | -4/+84 |
| * | Use the requested sim's map, not our own | Melanie | 2012-01-30 | 1 | -2/+2 |
* | | Draw brders around parcels for sale | Melanie | 2012-01-31 | 1 | -11/+37 |
* | | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 1 | -4/+84 |
* | | Use the requested sim's map, not our own | Melanie | 2012-01-30 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -19/+29 |
|\ \
| |/ |
|
| * | Patch in the rest of the maptile stuff | Melanie | 2012-01-30 | 1 | -3/+7 |
| * | Next step for world map overlays | Melanie | 2012-01-30 | 1 | -2/+3 |
| * | Some plumbing for map overlays | Melanie | 2012-01-30 | 1 | -15/+20 |
| * | Pickup map overlay tile from RegionSettings.ParcelImageID | BlueWall | 2012-01-30 | 1 | -1/+1 |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2012-01-30 | 3 | -8/+17 |
|\ \ |
|
| * | | Add the ability to abort a pending restart using the viewer UI or a | Melanie | 2012-01-28 | 2 | -0/+9 |
| * | | Fix calculating land prim count type width issue | Melanie | 2012-01-28 | 1 | -8/+8 |
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-29 | 2 | -4/+3 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork | BlueWall | 2012-01-28 | 4 | -14/+89 |
| |\ |
|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-28 | 4 | -14/+89 |
| | |\ |
|
| * | | | Adding our parcel's generated id to map packets | BlueWall | 2012-01-28 | 1 | -2/+2 |
| |/ / |
|