| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Committing the Avination calling card module | Melanie | 2012-03-28 | 1 | -0/+286 |
| | | |||||
| * | Merge branch 'master' into careminster | Melanie | 2012-03-29 | 20 | -85/+471 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | * | Add comment about setting client.SceneAgent in AddNewClient() | Justin Clark-Casey (justincc) | 2012-03-29 | 1 | -0/+3 |
| | | | |||||
| | * | Simplify friends caching by only doing this for root agents - no functions ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 9 | -55/+31 |
| | | | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting. | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 7 | -4/+4 |
| | |\ | |||||
| | | * | BulletSim: update 64 bit libraries and change Linux configuration to use the ↵ | Robert Adams | 2012-03-28 | 7 | -4/+4 |
| | | | | | | | | | | | | | files in the lib32 and lib64 directories as needed. | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -23/+430 |
| | |\ \ | | |/ | |||||
| | | * | HG 2.0 Suitcase inventory: proof of concept now working properly with the ↵ | Diva Canto | 2012-03-28 | 1 | -10/+11 |
| | | | | | | | | | | | | | heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message. | ||||
| | | * | HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the ↵ | Diva Canto | 2012-03-28 | 3 | -23/+429 |
| | | | | | | | | | | | | | hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival. | ||||
| | * | | Enable voice by default on parcels to weaken effects of viewer 2/3 ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | | | | | | | ParcelVoiceInfoRequest bug Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available. Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately. Dropping the request entirely is a bit better but the viewer still retries after a minute. Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all. Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 2 | -15/+18 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 3 | -1/+51 |
| | |\ | |||||
| | | * | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | More on switching the root folder from under the viewer. More experiments. | Diva Canto | 2012-03-27 | 2 | -15/+18 |
| | | | | |||||
| * | | | Typo fix | Melanie | 2012-03-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Fix typos | Melanie | 2012-03-28 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 8 | -17/+226 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-03-28 | 5 | -16/+175 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 3 | -2/+120 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 2 | -1/+116 |
| | | | |\ | |||||
| | | | * | | Add "friends show cache <first-name> <last-name>" command for debugging ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -2/+120 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly. | ||||
| | | * | | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵ | Diva Canto | 2012-03-27 | 2 | -14/+55 |
| | | | |/ | | |/| | | | | | | | | | guarded by an obscure config that no one but me should be using at this point. | ||||
| | * | | | Start on Bulk inventory update via CAPS. Not functional yet. HG v2 | Melanie | 2012-03-28 | 3 | -1/+51 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 4 | -48/+73 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs | ||||
| | * | | Add a corresponding method for items. HG v2 | Melanie | 2012-03-28 | 2 | -0/+39 |
| | | | | |||||
| | * | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 2 | -1/+77 |
| | |/ | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come | ||||
| | * | minor: Add some documentation to OnNewClient and OnClientClosed events | Justin Clark-Casey (justincc) | 2012-03-28 | 1 | -2/+10 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-28 | 3 | -4/+2 |
| | |\ | |||||
| | * | | minor: clean up some code formatting in VivoxVoiceModule.cs | Justin Clark-Casey (justincc) | 2012-03-27 | 1 | -54/+25 |
| | | | | |||||
| * | | | Add SendRemoveInventoryFolders which allows to remove one or more | Melanie | 2012-03-28 | 2 | -1/+77 |
| | | | | | | | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 18 | -53/+347 |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | | Reverse a conditional in XInventory that made updating system folder evrsion ↵ | Melanie | 2012-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | numbers impossible | ||||
| | * | | Let grided simulators retrieve the user's inventory skeleton | Diva Canto | 2012-03-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 16 | -49/+348 |
| | |\ \ | | |/ | |||||
| | | * | Two new scripting functions osInviteToGroup(userID) and ↵ | Snoopy Pfeffer | 2012-03-27 | 5 | -23/+183 |
| | | | | | | | | | | | | | osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups. | ||||
| | | * | Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim | Snoopy Pfeffer | 2012-03-27 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2012-03-27 | 198 | -2302/+6721 |
| | | | |\ | |||||
| | | | * | | When loading objects from DB, first add to scene, then call ↵ | Dan Lake | 2012-03-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | TriggerOnSceneObjectLoaded. | ||||
| | | * | | | User level based restrictions for HyperGrid teleports, asset uploads, group ↵ | Snoopy Pfeffer | 2012-03-27 | 11 | -25/+164 |
| | | | |/ | | |/| | | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. | ||||
| | * | | | Amend to previous commit regarding the config name. Bugs bite. | Diva Canto | 2012-03-27 | 1 | -2/+0 |
| | |/ / | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 3 | -3/+37 |
| |\ \ \ | |/ / | |||||
| | * | | HG: beginning of a more restrictive inventory access procedure (optional). ↵ | Diva Canto | 2012-03-27 | 3 | -3/+37 |
| | | | | | | | | | | | | | Experimental: we'll try switching the root folder from under the viewer. | ||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 17 | -58/+91 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 10 | -12/+51 |
| | |\ \ | |||||
| | | * | | Add Garmin Kawaguichi to CONTRIBUTORS.txt | Justin Clark-Casey (justincc) | 2012-03-27 | 1 | -0/+1 |
| | | | | | |||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-27 | 15 | -138/+531 |
| | | |\ \ | |||||
| | | | * | | BulletSim: make avatar animations update properly. | Robert Adams | 2012-03-26 | 3 | -9/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that ODE calls the avatar collision handling routine even if there are no collisions. This causes the animation to be updated. So, for instance, going from HOVER to FLY is caused by the physics engine calling the collision routine each frame with 0 collisions. | ||||
| | | | * | | BulletSim: update BulletSim binaries and configuration fixing a crash which ↵ | Robert Adams | 2012-03-26 | 5 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | happens when there are more than a few hundred physical objects. | ||||
| | | * | | | In TerrainModule.cs, the command terrain save-tile is modified to remove an ↵ | Garmin Kawaguichi | 2012-03-27 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | unnecessary double argument "minimum Y tile" | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |